6 files changed, 24 insertions, 24 deletions
diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse/PKGBUILD
index dfffa4947..6734cce30 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse/PKGBUILD
@@ -4,26 +4,26 @@
 # Contributor (Arch): jlvsimoes <jlvsimoes@oninet.pt>
 # Contributor (Arch): kevin <kevin@archlinux.org>
 # Contributor: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=abuse
-pkgname=abuse-libre
+pkgname=abuse
+_pkgname=$pkgname-libre
 pkgver=0.8
 pkgrel=4
 pkgdesc='Side-scroller action game that pits you against ruthless alien killers, without nonfree claudio support'
 arch=('x86_64' 'i686' 'mips64el')
-url='http://abuse.zoy.org/'
+url="http://$pkgname.zoy.org/"
 license=('GPL' 'custom')
-provides=($_pkgname=$pkgver)
 replaces=($_pkgname)
 conflicts=($_pkgname)
 depends=('gcc-libs' 'libgl' 'sdl_mixer' 'glu' 'desktop-file-utils')
 makedepends=('gendesk' 'mesa-libgl' 'glu')
-install="$_pkgname.install"
-mksource=("http://abuse.zoy.org/raw-attachment/wiki/download/$_pkgname-$pkgver.tar.gz"
+install="$pkgname.install"
+mksource=("http://$pkgname.zoy.org/raw-attachment/wiki/download/$_pkgname-$pkgver.tar.gz"
           'non-claudio.patch')
 source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
-        'abuse.sh'
-        'default.abuserc'
+        "$pkgname.sh"
+        "default.${pkgname}rc"
         'default.gamma.lsp')
 mksha256sums=('0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488'
               '017cb58acf5ba8cdb889f97a758318cb66ab4947b860a77ab16b932c3f21b98f')
@@ -33,7 +33,7 @@ sha256sums=('ff7018b3ddcc6d2e702bc14eb2884622677ac5141c36e1fc0cdd127df3017f7d'
             '13df83fea60918d29d5141cdfbd8d56147c053e88d3701209ae676f46447c2f6')
 
 mksource() {
-  cd "abuse-$pkgver"
+  cd "$pkgname-$pkgver"
 
   # Remove the nonfree claudio addon
   rm -rvf ./data/addon/claudio
@@ -41,39 +41,39 @@ mksource() {
 }
 
 prepare() {
-  cd "abuse-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  gendesk -n -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc"
+  gendesk -n -f --pkgname "$pkgname" --pkgdesc "$pkgdesc"
 }
 
 build() {
-  cd "abuse-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --with-assetdir="/usr/share/$_pkgname/orig" --with-x
+  ./configure --prefix=/usr --with-assetdir="/usr/share/$pkgname/orig" --with-x
   make
 }
 
 package() {
-  cd "abuse-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
   # Desktop shortcut and icon
-  install -Dm644 "$_pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$_pkgname.desktop"
-  install -Dm644 "doc/$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+  install -Dm644 "$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "doc/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
 
   # Sane defaults
-  mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf"
-  install -Dm755 "$srcdir/$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
-  install -Dm644 "$srcdir/default.${_pkgname}rc" \
-    "$pkgdir/usr/share/$_pkgname/default.${_pkgname}rc"
+  mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf"
+  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 "$srcdir/default.${pkgname}rc" \
+    "$pkgdir/usr/share/$pkgname/default.${pkgname}rc"
   install -Dm644 "$srcdir/default.gamma.lsp" \
-    "$pkgdir/usr/share/$_pkgname/default.gamma.lsp"
+    "$pkgdir/usr/share/$pkgname/default.gamma.lsp"
 
   # License (for the original source code)
-  install -d "$pkgdir/usr/share/licenses/abuse"
-  sed -n '1,/^$/p' src/view.cpp > "$pkgdir/usr/share/licenses/abuse/original"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  sed -n '1,/^$/p' src/view.cpp > "$pkgdir/usr/share/licenses/$pkgname/original"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/abuse-libre/abuse.install b/libre/abuse/abuse.install
index ad97d7bab..ad97d7bab 100644
--- a/libre/abuse-libre/abuse.install
+++ b/libre/abuse/abuse.install
diff --git a/libre/abuse-libre/abuse.sh b/libre/abuse/abuse.sh
index 228bb6f7b..228bb6f7b 100644
--- a/libre/abuse-libre/abuse.sh
+++ b/libre/abuse/abuse.sh
diff --git a/libre/abuse-libre/default.abuserc b/libre/abuse/default.abuserc
index ff116819f..ff116819f 100644
--- a/libre/abuse-libre/default.abuserc
+++ b/libre/abuse/default.abuserc
diff --git a/libre/abuse-libre/default.gamma.lsp b/libre/abuse/default.gamma.lsp
index 9a77afa27..9a77afa27 100644
--- a/libre/abuse-libre/default.gamma.lsp
+++ b/libre/abuse/default.gamma.lsp
diff --git a/libre/abuse-libre/non-claudio.patch b/libre/abuse/non-claudio.patch
index 2a29e53f0..2a29e53f0 100644
--- a/libre/abuse-libre/non-claudio.patch
+++ b/libre/abuse/non-claudio.patch