[arch-commits] Commit in sasteroids/trunk (PKGBUILD sasteroids.sh)

[Alexander Rødseth]

    Date: Sunday, March 21, 2021 @ 20:30:22
  Author: arodseth
Revision: 898483

Full 2021 refresh

Modified:
  sasteroids/trunk/PKGBUILD
Deleted:
  sasteroids/trunk/sasteroids.sh

---------------+
 PKGBUILD      |   45 ++++++++++++++++-----------------------------
 sasteroids.sh |    3 ---
 2 files changed, 16 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-21 20:26:55 UTC (rev 898482)
+++ PKGBUILD	2021-03-21 20:30:22 UTC (rev 898483)
@@ -1,58 +1,45 @@
-# Maintainer: Alexander F Rødseth <xyprot at archlinux.org>
+# Maintainer: Alexander F. Rødseth <xyprot at archlinux.org>
 # Contributor: Matthew Stewart <stewartmatthew6 at gmail.com>
 
 pkgname=sasteroids
 pkgver=3.0.1
-pkgrel=8
-pkgdesc='SDL Asteroids'
-arch=('x86_64')
+pkgrel=9
+pkgdesc='Sasteroid game from 1994, ported to SDL'
+arch=(x86_64)
 url='https://sdlsas.sourceforge.net/'
-license=('GPL')
-depends=('sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'mesa' 'glu')
-makedepends=('setconf' 'gendesk' 'glu')
-source=("https://sourceforge.net/projects/sdlsas/files/SDL%20Sasteroids%20Source%20Releases/$pkgver/SDLSasteroids-$pkgver.tar.gz"
+license=(GPL)
+depends=(mesa sdl_image sdl_mixer sdl_ttf)
+makedepends=(gendesk glu setconf)
+source=("sasteroids-$pkgver.tar.gz::https://sourceforge.net/projects/sdlsas/files/SDL%20Sasteroids%20Source%20Releases/$pkgver/SDLSasteroids-$pkgver.tar.gz"
         "$pkgname.png::http://icons.iconarchive.com/icons/etherbrian/space-bits/32/Asteroids-icon.png"
-        $pkgname.sh
         sbitmap.patch
         makefile.patch)
 sha256sums=('f447a85d75913ee9d1be0bba68813e0627a4c163ab5d12c7fd5a8ea5f455502c'
             'fc6ded2d7a309333eb4cad2e6e03305e43827690ecbd4ebb01012c8598db1f49'
-            '6f2ca922eb0be29d6866933aece1cc38dd224adb5f04834cdd0cb12cd7739cbf'
             'eb2139434aae832b395b1d1f6a4ef188f69ebd7c5ed5128df9129027ff9a4ac6'
             '6b35ad008d29cd1433cdbc6094231b5c399e5fc10a65670a67177e44c0f259c6')
 
 prepare() {
-  gendesk -f \
-    --pkgname "$pkgname" \
+  gendesk -f -n \
+    --pkgname $pkgname \
     --pkgdesc "$pkgdesc" \
     --categories 'Game;ArcadeGame'
-
-  setconf "SDLSasteroids-$pkgver/src/Makefile" CFLAGS '$(INC) $(OPTS) -w'
-
+  patch -p1 -i makefile.patch
   patch -p1 -i sbitmap.patch
-  patch -p1 -i makefile.patch
-
-  # compress man page
-  gzip -f -9 "SDLSasteroids-$pkgver/$pkgname.6"
-  sed 's/\.6 /.6.gz /' -i "SDLSasteroids-$pkgver/Makefile"
-
-  # fix man page installation instructions
+  setconf "SDLSasteroids-$pkgver/src/Makefile" OPTS '-pipe -O3 -Wl,-z,now -Wl,--as-needed -w'
   setconf "SDLSasteroids-$pkgver/Makefile" MANDIR '$(DESTDIR)/usr/share/man/man6/'
   sed 's:$(MANDIR)/man6:$(MANDIR):' -i "SDLSasteroids-$pkgver/Makefile"
+  sed 's:share:bin:g' -i "SDLSasteroids-$pkgver/src/gameconf.h"
 }
 
 build() {
-  CXXFLAGS="$CXXFLAGS -w" make -C "SDLSasteroids-$pkgver"
+  make -C SDLSasteroids-$pkgver
 }
 
 package() {
-  make -C "SDLSasteroids-$pkgver" DESTDIR="$pkgdir" install
-
-  mv "$pkgdir/usr/bin/sasteroids" "$pkgdir/usr/bin/sasteroids.elf"
-  install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/sasteroids"
+  make -C SDLSasteroids-$pkgver DESTDIR="$pkgdir" install
+  install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
   install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 }
 
 # getver: packages.gentoo.org/packages/games-arcade/sdlsasteroids
-# vim:ts=2 sw=2 et:

Deleted: sasteroids.sh
===================================================================
--- sasteroids.sh	2021-03-21 20:26:55 UTC (rev 898482)
+++ sasteroids.sh	2021-03-21 20:30:22 UTC (rev 898483)
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/sasteroids
-exec /usr/bin/sasteroids.elf