Date: Tuesday, June 30, 2015 @ 13:47:29 Author: arodseth Revision: 136154
Sources moved to github + suggested improvements from bug reports Modified: plan9port/trunk/PKGBUILD plan9port/trunk/acme.sh plan9port/trunk/plan9.sh ----------+ PKGBUILD | 27 ++++++++++++++++++--------- acme.sh | 2 +- plan9.sh | 2 -- 3 files changed, 19 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-06-30 10:30:44 UTC (rev 136153) +++ PKGBUILD 2015-06-30 11:47:29 UTC (rev 136154) @@ -5,25 +5,25 @@ # Contributor: Chris Brannon <cmbranno...@gmail.com> pkgname=plan9port -pkgver=20140306 -pkgrel=2 -pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' +pkgver=20150629 +pkgrel=1 +pkgdesc='Ports of applications from Plan 9' arch=('x86_64' 'i686') url='http://swtch.com/plan9port/' license=('custom') depends=('xorg-server' 'libxt' 'libxext' 'fuse') -makedepends=('gendesk') +makedepends=('gendesk' 'git') optdepends=('python2: for the codereview script') provides=('plan9') install='plan9.install' options=('!zipman' 'staticlibs') -source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tgz" +source=("git://github.com/9fans/plan9port.git#commit=71de840f054e52a8a077b2333edc1f4243480359" 'plan9.sh' 'acme.png' 'acme.desktop' 'acme.sh') -sha256sums=('cbb826cde693abdaa2051c49e7ebf75119bf2a4791fe3b3229f1ac36a408eaeb' - '8768c080a8ceb0a52a3f866bd8ffc4b26f9deb97c6877ceea78ec0b316325a6b' +sha256sums=('SKIP' + '60df44d57b06962f6860ee501a947d165ab8ccd01dd01ba47c82bc729d2ed6d7' 'b9046c4b7ed5e8e22bf3ea669d65ff681e616663b9743909a225884ac6fb261b' '57fdddb70ba969ff4aa2f6c5b68dec02abe937a69044fe00006726e1900d5ffe' - 'fa6d13acba9db07b5b394ffe828548efa532ff8cc8e1d321b65ae6fc65e1f444') + '9c6eb7881f7333077d701f5201f7a620214d6c5c91c11b2ea7964483214e6cb2') prepare() { @@ -30,6 +30,9 @@ # Generate a desktop shortcut for the Acme editor gendesk -f --pkgname acme --name Acme --genericname Editor \ --comment 'Editor from Plan9' --categories 'Application;Development;TextEditor' + + # Use _DEFAULT_SOURCE instead of _BSD_SOURCE + grep -rl _BSD_SOURCE "$pkgname" | xargs sed -i s':_BSD_SOURCE:_DEFAULT_SOURCE:g' } package() { @@ -63,7 +66,7 @@ -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,' # Package text files - for i in CHANGES CONTRIBUTORS README TODO; do + for i in CHANGES CONTRIBUTORS README.md TODO; do install -m644 $i "$pkgdir/usr/share/doc/$pkgname" rm -f $i done @@ -84,6 +87,12 @@ install -Dm644 acme.desktop "$pkgdir/usr/share/applications/acme.desktop" install -Dm755 acme.sh "$pkgdir/usr/bin/acme" install -Dm644 acme.png "$pkgdir/usr/share/pixmaps/acme.png" + + ## Build man pages + #export PLAN9="$pkgdir/usr/lib/plan9" + #export PATH="$PLAN9/bin:/usr/bin" + #cd "$pkgdir/usr/lib/plan9/dist" + #9 mk man } # vim:set ts=2 sw=2 et: Modified: acme.sh =================================================================== --- acme.sh 2015-06-30 10:30:44 UTC (rev 136153) +++ acme.sh 2015-06-30 11:47:29 UTC (rev 136154) @@ -1,3 +1,3 @@ #!/bin/sh -source /etc/profile.d/plan9.sh +. /etc/profile.d/plan9.sh 9 acme "$@" Modified: plan9.sh =================================================================== --- plan9.sh 2015-06-30 10:30:44 UTC (rev 136153) +++ plan9.sh 2015-06-30 11:47:29 UTC (rev 136154) @@ -1,4 +1,2 @@ export PLAN9=/usr/lib/plan9 export PATH=$PATH:$PLAN9/bin -export ROOTPATH=$ROOTPATH:$PLAN9/bin -export MANPATH=$MANPATH:$PLAN9/man