Small cleanup.

2 files changed, 19 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e15980e66d8..9b77abec052b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = alephone
 	pkgdesc = A free, enhanced port of the classic FPS "Marathon 2" by Bungie Software
 	pkgver = 1.2.1_20150620
-	pkgrel = 2
-	url = http://marathon.sourceforge.net/
+	pkgrel = 3
+	url = https://alephone.lhowon.org/
 	arch = i686
 	arch = x86_64
 	license = GPL3
@@ -19,15 +19,11 @@ pkgbase = alephone
 	depends = ffmpeg
 	depends = boost-libs
 	depends = curl
-	optdepends = alephone-emr: community-made scenario
 	optdepends = alephone-eternalx: community-made scenario
 	optdepends = alephone-evil: community-made scenario
 	optdepends = alephone-infinity: original data for Marathon Infinity
 	optdepends = alephone-marathon: M1A1 data converted for AlephOne
 	optdepends = alephone-marathon2: original data for Marathon 2: Durandal
-	optdepends = alephone-red: community-made scenario
-	optdepends = alephone-rubiconx: community-made scenario
-	optdepends = alephone-tempus_irae: community-made scenario
 	source = https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20150620/AlephOne-20150620.tar.bz2
 	source = alephone-update-old-ffmpeg-enums.patch
 	sha256sums = c0f360dfb74a6264f95d375103a74000930cf0439ffb0464f915f5379443e133
diff --git a/PKGBUILD b/PKGBUILD
index f56cbba178ad..9f469a0055d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,24 @@
 # Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
-# Contributor: Marcin Skory <armitage at q84fh dot net>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-# Contributor: Jacek Poplawski <jacekpoplawski__gmail>
+# Contributors: Marcin Skory, Arkham, Christoph Zeiler, Jacek Poplawski
 
 pkgname=alephone
 _pkgdate=20150620
 pkgver=1.2.1_$_pkgdate
-pkgrel=2
+pkgrel=3
 pkgdesc='A free, enhanced port of the classic FPS "Marathon 2" by Bungie Software'
 arch=('i686' 'x86_64')
-url="http://marathon.sourceforge.net/"
+url="https://alephone.lhowon.org/"
 license=('GPL3')
 depends=('sdl_ttf' 'sdl_image' 'sdl_net' 'smpeg' 'libmad' 'glu' 'zziplib'
          'ffmpeg' 'boost-libs' 'curl')
-# todo: figure out, if they are all compatible
-optdepends=('alephone-emr: community-made scenario'
-            'alephone-eternalx: community-made scenario' # ok!
-            'alephone-evil: community-made scenario' # ok!
-            'alephone-infinity: original data for Marathon Infinity' # ok!
-            'alephone-marathon: M1A1 data converted for AlephOne' # ok!
-            'alephone-marathon2: original data for Marathon 2: Durandal' # ok!
-            'alephone-red: community-made scenario'
-            'alephone-rubiconx: community-made scenario'
-            'alephone-tempus_irae: community-made scenario')
+optdepends=('alephone-eternalx: community-made scenario'
+            'alephone-evil: community-made scenario'
+            'alephone-infinity: original data for Marathon Infinity'
+            'alephone-marathon: M1A1 data converted for AlephOne'
+            'alephone-marathon2: original data for Marathon 2: Durandal')
 makedepends=('boost' 'mesa' 'icoutils')
 source=("https://github.com/Aleph-One-Marathon/alephone/releases/download/release-$_pkgdate/AlephOne-$_pkgdate.tar.bz2"
-        "$pkgname-update-old-ffmpeg-enums.patch")
+        "alephone-update-old-ffmpeg-enums.patch")
 sha256sums=('c0f360dfb74a6264f95d375103a74000930cf0439ffb0464f915f5379443e133'
             '2c83da1a751e677d8a980e27e3df684943f7b6b883aca5b047a11783232d4324')
 
@@ -34,17 +26,14 @@ prepare() {
   cd AlephOne-$_pkgdate
 
   # backported patch to make it compile correctly
-  patch -Np1 < ../$pkgname-update-old-ffmpeg-enums.patch
-
-  # lowercase for (folder) name
-  sed "s|PACKAGE='AlephOne'|PACKAGE='alephone'|g" -i configure
+  patch -Np1 < ../alephone-update-old-ffmpeg-enums.patch
 
   # convert the windows icons
   cd Resources/Windows
-  icotool -x -w 48 alephone.ico -o ../alephone.png
-  icotool -x -w 48 marathon.ico -o ../alephone-marathon.png
-  icotool -x -w 48 marathon2.ico -o ../alephone-marathon2.png
-  icotool -x -w 48 marathon-infinity.ico -o ../alephone-infinity.png
+  icotool -x -w 48 alephone.ico -o "$srcdir"/alephone.png
+  icotool -x -w 48 marathon.ico -o "$srcdir"/alephone-marathon.png
+  icotool -x -w 48 marathon2.ico -o "$srcdir"/alephone-marathon2.png
+  icotool -x -w 48 marathon-infinity.ico -o "$srcdir"/alephone-infinity.png
 }
 
 build() {
@@ -61,9 +50,9 @@ package() {
 
   # icons
   install -d "$pkgdir"/usr/share/icons
-  install -m644 Resources/*.png "$pkgdir"/usr/share/icons
+  install -m644 "$srcdir"/*.png "$pkgdir"/usr/share/icons
 
   # docs
-  install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
-  install -m644 docs/*.html "$pkgdir"/usr/share/doc/$pkgname
+  install -Dm644 README "$pkgdir"/usr/share/doc/alephone/README
+  install -m644 docs/*.html "$pkgdir"/usr/share/doc/alephone
 }