[arch-commits] Commit in plan9port/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Friday, August 2, 2019 @ 12:49:38
  Author: arodseth
Revision: 497049

upgpkg: plan9port 20190619-1

Modified:
  plan9port/trunk/PKGBUILD

----------+
 PKGBUILD |   29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-02 12:28:30 UTC (rev 497048)
+++ PKGBUILD	2019-08-02 12:49:38 UTC (rev 497049)
@@ -1,25 +1,25 @@
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
 # Contributor: phrakture <aaronmgriffin at gmail.com>
 # Contributor: Fazlul Shahriar <>
 # Contributor: Chris Brannon <cmbrannon79 at gmail.com>
 
 pkgname=plan9port
-pkgver=20171012
+pkgver=20190619
 pkgrel=1
 pkgdesc='Ports of applications from Plan 9'
 arch=('x86_64')
 url='https://swtch.com/plan9port/'
-license=('custom')
-depends=('xorg-server' 'libxt' 'libxext' 'fuse2')
-makedepends=('gendesk' 'git')
+license=(custom)
+depends=(fuse2 libxext libxt xorg-server)
+makedepends=(gendesk fontconfig git)
 optdepends=('python2: for the codereview script')
-provides=('plan9')
-install='plan9.install'
-options=('!zipman' 'staticlibs')
-source=("git://github.com/9fans/plan9port.git#commit=9e52ea8a29db42f37188fd8fa35d641724c3d015"
-        'plan9.sh' 'acme.png' 'acme.sh')
+provides=(plan9)
+install=plan9.install
+options=(staticlibs !zipman)
+source=("git+https://github.com/9fans/plan9port.git#commit=e995a0c101863688d5f14649ae3de45a7c43789c"
+        plan9.sh acme.png acme.sh)
 sha256sums=('SKIP'
-            '60df44d57b06962f6860ee501a947d165ab8ccd01dd01ba47c82bc729d2ed6d7'
+            'a8c8aee15c9dfa60d679567582e9335ae80293133b000326f3af7c630707e93c'
             'b9046c4b7ed5e8e22bf3ea669d65ff681e616663b9743909a225884ac6fb261b'
             '9c6eb7881f7333077d701f5201f7a620214d6c5c91c11b2ea7964483214e6cb2')
 
@@ -38,7 +38,7 @@
   # Use _DEFAULT_SOURCE instead of _BSD_SOURCE
   grep -rl _BSD_SOURCE | xargs sed -i s':_BSD_SOURCE:_DEFAULT_SOURCE:g'
 
-  # Try the gentoo way for fixing hardcoded paths
+  # Try the Gentoo way for fixing hardcoded paths
   grep --null -l -r '/usr/local/plan9' | xargs --null sed -i "s!/usr/local/plan9!/usr/lib/plan9!g"
 
   # Stop 9l from giving an 'undefined reference error' given no arguments, ref #55640
@@ -66,11 +66,6 @@
   rm -f config install.log install.sum install.txt configure Makefile INSTALL \
     LICENSE
 
-  # Fix python scripts
-  find "$pkgdir" -name '*.py' -print0 |xargs -0 \
-    sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/python2,' \
-    -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
-
   # Package text files
   for i in CHANGES CONTRIBUTORS README.md TODO; do
     install -m644 $i "$pkgdir/usr/share/doc/$pkgname"