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

Alexander Rødseth arodseth at archlinux.org
Tue Aug 15 21:17:51 UTC 2017


    Date: Tuesday, August 15, 2017 @ 21:17:51
  Author: arodseth
Revision: 251197

upgpkg: wings3d 2.1.5-3

Modified:
  wings3d/trunk/PKGBUILD
  wings3d/trunk/wings3d.sh

------------+
 PKGBUILD   |   46 +++++++++++++++++++++++++---------------------
 wings3d.sh |    4 +++-
 2 files changed, 28 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-15 21:13:09 UTC (rev 251196)
+++ PKGBUILD	2017-08-15 21:17:51 UTC (rev 251197)
@@ -1,55 +1,59 @@
 # $Id$
-# Maintainer: Alexander F Rødseth <rodseth at gmail.com>
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
 # Contributor: kappa <kappacurve at gmail.com>
 
 pkgname=wings3d
 pkgver=2.1.5
-pkgrel=2
+pkgrel=3
 pkgdesc='3D modeling program'
 arch=('x86_64' 'i686')
 url='http://www.wings3d.com/'
 license=('GPL')
-depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang')
+depends=('desktop-file-utils' 'erlang-sdl' 'erlang-cl')
 makedepends=('gendesk' 'imagemagick')
 optdepends=('povray: rendering support via POV-Ray')
-source=("http://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2"
-        "$pkgname.sh")
+source=("https://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2"
+        $pkgname.sh)
 sha256sums=('f0f03cfe9f0ee0ee6c734a2b7e50410d5f21238441cb1f34422b0ecde25b582c'
-            '9f91da23a91bd5808a4f3ce38472e262706f648804628648703ad3695df22e27')
+            'b44102a5c4f9f3cf71c17ef45ce534c5723b3aeb2f78298abdaf77b401982128')
+_p=${pkgname%3d}-$pkgver
 
 prepare() {
   gendesk -f -n \
-    --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'Wings3D' \
-    --genericname '3D Modeler' --categories 'Graphics;3DGraphics'
+    --name Wings3D \
+    --pkgname $pkgname \
+    --pkgdesc "$pkgdesc" \
+    --genericname '3D Modeler' \
+    --categories 'Graphics;3DGraphics'
 
-  convert "${pkgname%3d}-$pkgver/win32/wings.ico" "$pkgname.png"
+  convert $_p/win32/wings.ico $pkgname.png
 
   # Path fix for building wpc_lwo
-  ln -s "$srcdir/${pkgname%3d}-$pkgver" \
-    "${pkgname%3d}-$pkgver/plugins_src/import_export/wings"
-  ln -s "$srcdir/${pkgname%3d}-$pkgver" "$srcdir/wings"
+  ln -s $_p $_p/plugins_src/import_export/wings
+  ln -s $_p wings
 
-  sed -i 's/-Werror//' ${pkgname%3d}-$pkgver/{src,e3d,plugins_src/import_export}/Makefile
+  sed -i 's/-Werror//' $_p/{src,e3d,plugins_src/import_export}/Makefile
 }
 
 build() {
   export ESDL_PATH="$(echo /usr/lib/erlang/lib/esdl-*)"
   export ERL_LIBS="$srcdir"
-  make -C "${pkgname%3d}-$pkgver" all lang
+
+  make -C $_p all lang
 }
 
 package() {
-  install -Dm644 "$pkgname-3.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 "$pkgname.desktop" \
+  install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
+
+  install -Dm644 $pkgname.desktop \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 $pkgname-3.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+
   install -d "$pkgdir/usr/lib/$pkgname"
-
-  cd "${pkgname%3d}-$pkgver"
   for subdir in e3d ebin icons plugins psd shaders src textures tools; do
-    cp -r "$srcdir/${pkgname%3d}-$pkgver/$subdir/" "$pkgdir/usr/lib/$pkgname"
+    cp -r $_p/$subdir/ "$pkgdir/usr/lib/$pkgname"
   done
 }
 
 # getver: wings3d.com/?page_id=84
-# vim:set ts=2 sw=2 et:
+# vim:ts=2 sw=2 et:

Modified: wings3d.sh
===================================================================
--- wings3d.sh	2017-08-15 21:13:09 UTC (rev 251196)
+++ wings3d.sh	2017-08-15 21:17:51 UTC (rev 251197)
@@ -1,2 +1,4 @@
 #!/bin/sh
-erl -noinput -smp -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"}
+erl -noinput -smp \
+  -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin \
+  -run wings_start start_halt ${1+"$@"}



More information about the arch-commits mailing list