From 2f8045ba14153d1665148e3cff527ce4f6bf66e5 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 20 Feb 2014 03:34:20 +0000 Subject: Thu Feb 20 03:30:17 UTC 2014 --- community/fb-client/PKGBUILD | 4 ++-- community/flightgear/PKGBUILD | 6 +++--- community/freeradius/PKGBUILD | 20 ++++++++++--------- community/freeradius/krb5-build-fix.patch | 21 -------------------- community/go/PKGBUILD | 23 ++++++++++++++------- community/go/go.install | 13 ++++++++++++ community/go/go.sh | 1 + community/guvcview/PKGBUILD | 6 +++--- community/libfm/PKGBUILD | 9 +++++---- community/lightdm/PKGBUILD | 6 +++--- community/lxshortcut/PKGBUILD | 33 ------------------------------- community/multitail/PKGBUILD | 6 +++--- community/nodejs/PKGBUILD | 6 +++--- community/pcmanfm/PKGBUILD | 28 +++++++++++++------------- community/plan9port/PKGBUILD | 27 +++++++++++++++---------- community/plan9port/plan9.sh | 4 +++- community/python2-xapian/PKGBUILD | 14 ++++++------- community/simgear/PKGBUILD | 10 +++++----- community/simgear/osg-3.2.patch | 22 --------------------- community/xapian-core/PKGBUILD | 10 +++++----- 20 files changed, 114 insertions(+), 155 deletions(-) delete mode 100644 community/freeradius/krb5-build-fix.patch create mode 100644 community/go/go.sh delete mode 100644 community/lxshortcut/PKGBUILD delete mode 100644 community/simgear/osg-3.2.patch (limited to 'community') diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index e07a9f3a4..7879f7c88 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Florian "Bluewind" Pritz pkgname=fb-client -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ license=('GPL3') depends=('curl' 'bash') optdepends=('xclip: for automatically copying the URL into the clipboard') source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig}) -md5sums=('6938cff329e7965593f270747e94539f' +md5sums=('181b3d64000eaf5dad4ec7cdceed479c' 'SKIP') build() { diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index c61451431..ac7d337f1 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101480 2013-11-26 11:05:15Z spupykin $ +# $Id: PKGBUILD 105914 2014-02-19 10:07:30Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: William Rea # Contributor: Hans Janssen pkgname=flightgear -pkgver=2.12.1 +pkgver=3.0.0 pkgrel=1 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) @@ -16,7 +16,7 @@ options=('!makeflags') #source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") #source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2") source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2") -md5sums=('0e57582b9e83d7d44e82761792a79793') +md5sums=('e943e17db110e2f9e82a00acaaa11790') build() { cd $srcdir/flightgear-$pkgver diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index e4189bd17..0b3911119 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103884 2014-01-13 10:05:17Z spupykin $ +# $Id: PKGBUILD 105909 2014-02-19 08:49:58Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" @@ -17,18 +17,20 @@ install=$pkgname.install source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig} freeradius.tmpfiles freeradius.service - krb5-build-fix.patch) -md5sums=('e805282ff8fc2b273c23e44967322002' + https://github.com/FreeRADIUS/freeradius-server/commit/ff5147c9e5088c7.patch) +md5sums=('40b7533582c3f870af117213e8905958' 'SKIP' 'f959e89812bedfc9f8308076f78cd74e' 'e3f18e3a25df3b692e59f60605354708' - 'c6a61de7576933f59154a53bfc12a2d2') + '9dc9a08bee8b0c3e4822c94f272e1fd6') + +prepare() { + cd $srcdir/freeradius-server-$pkgver + patch -p1 <$srcdir/ff5147c9e5088c7.patch +} build() { cd $srcdir/freeradius-server-$pkgver -# export CFLAGS="$CFLAGS -fno-strict-aliasing" -# sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in -# patch -p1 <$srcdir/krb5-build-fix.patch ./configure --with-system-libtool --with-system-libltdl \ --prefix=/usr --enable-heimdal-krb5 \ --localstatedir=/var \ diff --git a/community/freeradius/krb5-build-fix.patch b/community/freeradius/krb5-build-fix.patch deleted file mode 100644 index 11dae7090..000000000 --- a/community/freeradius/krb5-build-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c ---- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c 2010-09-28 11:03:56.000000000 +0000 -+++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c 2011-04-29 09:26:10.000000000 +0000 -@@ -375,7 +375,7 @@ - * Heimdal krb5 verification - */ - radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n", -- *userP->name.name_string.val, -+ "-" /* *userP->name.name_string.val*/, - userP->realm); - - krb5_cc_default(context, &id); -@@ -390,7 +390,7 @@ - - radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )", - error_message(ret), -- *userP->name.name_string.val, -+ "-" /* *userP->name.name_string.val */, - userP->realm); - - return RLM_MODULE_REJECT; diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index d3bbcd4c0..56e9c03db 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104859 2014-01-27 16:24:41Z arodseth $ +# $Id: PKGBUILD 105906 2014-02-18 23:59:49Z arodseth $ # Maintainer: Vesa Kaihlavirta # Maintainer: Alexander Rødseth # Contributor: Rémy Oudompheng @@ -10,7 +10,7 @@ pkgname=go pkgver=1.2 -pkgrel=2 +pkgrel=3 epoch=2 pkgdesc='Compiler and tools for the Go programming language from Google' arch=('x86_64' 'i686') @@ -19,16 +19,22 @@ license=('custom') depends=('perl' 'gawk') makedepends=('inetutils') options=('!strip' 'staticlibs') -optdepends=('liteide: IDE for editing and building projects written in Go') +optdepends=('liteide: IDE for editing and building projects written in Go' + 'mercurial: Version control system written in Python' + 'git: Version control system written in C') install="$pkgname.install" backup=('usr/lib/go/bin') if [ "$CARCH" == 'x86_64' ]; then - source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz") - sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2') + source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" + 'go.sh') + sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2' + 'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a') else - source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz") - sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651') + source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz" + 'go.sh') + sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651' + 'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a') fi build() { @@ -129,6 +135,9 @@ package() { install -Dm644 src/pkg/runtime/cgocall.h \ "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h" + # In order to make godoc work, see FS#38597 + install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" + # This is to make go get code.google.com/p/go-tour/gotour and # then running the gotour executable work out of the box. ln -sf /usr/bin "$pkgdir/usr/lib/go/bin" diff --git a/community/go/go.install b/community/go/go.install index 286aaf9dd..2f6482620 100644 --- a/community/go/go.install +++ b/community/go/go.install @@ -8,6 +8,19 @@ post_install() { echo ' export PATH=$PATH:~/go/bin' echo ' go get code.google.com/p/go-tour/gotour' echo + echo 'For adding useful go tools:' + echo + echo ' go get code.google.com/p/go.tools/cmd/benchcmp' + echo ' go get code.google.com/p/go.tools/cmd/cover' + echo ' go get code.google.com/p/go.tools/cmd/godoc' + echo ' go get code.google.com/p/go.tools/cmd/goimports' + echo ' go get code.google.com/p/go.tools/cmd/gotype' + echo ' go get code.google.com/p/go.tools/cmd/html2article' + echo ' go get code.google.com/p/go.tools/cmd/ssadump' + echo ' go get code.google.com/p/go.tools/cmd/vet' + echo + echo '#go-nuts at irc.freenode.net may provide more answers.' + echo } # vim:set ts=2 sw=2 et: diff --git a/community/go/go.sh b/community/go/go.sh new file mode 100644 index 000000000..8393dc8d2 --- /dev/null +++ b/community/go/go.sh @@ -0,0 +1 @@ +export GOROOT=/usr/lib/go diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD index 6ba517283..174bc39e1 100644 --- a/community/guvcview/PKGBUILD +++ b/community/guvcview/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102513 2013-12-12 16:22:48Z giovanni $ +# $Id: PKGBUILD 105940 2014-02-19 16:43:36Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Maxwell Pray a.k.a. Synthead pkgname=guvcview -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="A video viewer and capturer for the linux uvc driver" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('pkg-config' 'intltool') optdepends=('pulseaudio: for PulseAudio support') options=('!docs') source=("http://downloads.sourceforge.net/project/${pkgname}/source/${pkgname}-src-${pkgver}.tar.gz") -md5sums=('93fa335e6ce52bb730541d5280ed0dad') +md5sums=('f9c510ed9908a8d20ca27099aca948a7') build() { cd "${srcdir}/${pkgname}-src-${pkgver}" diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index a0df8bccd..454759025 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 105876 2014-02-17 13:45:08Z bpiotrowski $ +# $Id: PKGBUILD 105946 2014-02-19 18:06:55Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski # Contributor: Unknown47 # Contributor: Angel Velasquez # Contributor: Juergen Hoetzel pkgname=libfm -pkgver=1.1.4 -pkgrel=1 +pkgver=1.2.0 +pkgrel=2 pkgdesc='Library for file management' url='http://pcmanfm.sourceforge.net/' arch=('i686' 'x86_64') @@ -14,9 +14,10 @@ license=('GPL') groups=('lxde') depends=('gtk2' 'menu-cache' 'udisks' 'desktop-file-utils' 'libexif') makedepends=('intltool') +replaces=('lxshortcut') install=libfm.install source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz) -md5sums=('fd3ff9174e097ab3fd619e4a10fd822a') +md5sums=('07d1361bc008db46b0fd4c775f5696de') build() { cd $pkgname-$pkgver diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index 821191d65..a50c7166f 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104558 2014-01-22 19:29:43Z alucryd $ +# $Id: PKGBUILD 105938 2014-02-19 16:00:07Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: Morfeo pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') -pkgver=1.8.6 +pkgver=1.8.7 pkgrel=1 epoch=1 pkgdesc='A lightweight display manager' @@ -20,7 +20,7 @@ source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbas 'lightdm.rules' 'lightdm-default-config.patch' 'Xsession') -sha256sums=('111760e65d9f29e4bfe41a8affc9d8aa4163d92832a0d2be03ccae4618603b9e' +sha256sums=('6a56b98224f147e27e0c26ce586ae9b7380dd23291b38a625fcc79a50cc63e39' '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a' 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' diff --git a/community/lxshortcut/PKGBUILD b/community/lxshortcut/PKGBUILD deleted file mode 100644 index ec232ec5b..000000000 --- a/community/lxshortcut/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 99904 2013-10-31 02:23:19Z allan $ -# Maintainer: Bartłomiej Piotrowski -# Contributor: swanson -# Contributor: zoulnix -# Contributor: n6W588kJ2d - -pkgname=lxshortcut -pkgver=0.1.2 -pkgrel=1 -pkgdesc='Small program used to edit application shortcuts' -arch=('i686' 'x86_64') -url="http://lxde.org/" -license=('GPL') -groups=('lxde') -depends=('gtk2') -makedepends=('autoconf' 'automake' 'gcc' 'intltool' 'make' 'pkg-config') -source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('72f0dfafa8098be853beae6e33b5e13b') - -build() { - cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var - - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=${pkgdir} install -} diff --git a/community/multitail/PKGBUILD b/community/multitail/PKGBUILD index e9626e58e..0398ee986 100644 --- a/community/multitail/PKGBUILD +++ b/community/multitail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101979 2013-12-03 09:00:37Z kkeen $ +# $Id: PKGBUILD 105957 2014-02-19 21:11:15Z kkeen $ # Maintainer: Kyle Keen # Contributor: Kevin Piche # Contributor: Roberto Carvajal pkgname=multitail -pkgver=6.0 +pkgver=6.2.1 pkgrel=1 pkgdesc="Lets you view one or multiple files like the original tail program" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.vanheusden.com/multitail" depends=('ncurses') backup=('etc/multitail.conf') source=("${url}/${pkgname}-${pkgver}.tgz") -md5sums=('fb8efc547d389257021885fe5402255c') +md5sums=('f83419bd2b90ae4227c5a3ce2f66b56d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 679d939f7..078aecdc0 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104706 2014-01-24 17:24:23Z bpiotrowski $ +# $Id: PKGBUILD 105921 2014-02-19 10:26:16Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.25 +pkgver=0.10.26 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('46eef3b9d5475a2081dc2b2f7cf1f4c3a56824d1fc9b04e7ed1d7a88e8f6b36f') +sha256sums=('ef5e4ea6f2689ed7f781355012b942a2347e0299da0804a58de8e6281c4b1daa') prepare() { cd node-v$pkgver diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index ef59a43b8..b9377e19f 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 97022 2013-09-10 14:32:02Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 105925 2014-02-19 10:35:08Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski # Contributor: Unknown47 # Contributor: Angel Velasquez # Contributor: Juergen Hoetzel pkgname=pcmanfm -pkgver=1.1.2 -pkgrel=2 -pkgdesc="An extremely fast and lightweight file manager" +pkgver=1.2.0 +pkgrel=1 +pkgdesc='Extremely fast and lightweight file manager' arch=('i686' 'x86_64') -url="http://pcmanfm.sourceforge.net/" +url='http://pcmanfm.sourceforge.net/' license=('GPL') groups=('lxde') depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') makedepends=('intltool') optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems') install=$pkgname.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz) -md5sums=('41104699e653ff2b0a9a9e80a257d6a2') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz) +md5sums=('11d59a492c9802866279a6e7e2b3f49e') build() { - cd $srcdir/$pkgname-$pkgver - - ./configure --sysconfdir=/etc --prefix=/usr + cd $pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr make LDFLAGS+=' -lm' } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - sed -e 's|x-directory/normal|inode/directory|' -i $pkgdir/usr/share/applications/pcmanfm.desktop + sed -e 's|x-directory/normal|inode/directory|' -i \ + "$pkgdir"/usr/share/applications/pcmanfm.desktop } diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index cc69553ba..4aa216d58 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104876 2014-01-27 23:51:46Z arodseth $ +# $Id: PKGBUILD 105934 2014-02-19 12:29:36Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: phrakture # Contributor: Fazlul Shahriar @@ -6,7 +6,7 @@ pkgname=plan9port pkgver=20131024 -pkgrel=3 +pkgrel=4 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' arch=('x86_64' 'i686') url='http://swtch.com/plan9port/' @@ -19,14 +19,16 @@ options=('!zipman' 'staticlibs') source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tgz" 'plan9.sh') sha256sums=('5cba7856bdb35a96a923120e61d320d424fee1a6f09b7af3e87eb7814a747d4f' - 'c216efa3455ba0b22b1723ae62e4c1e21b3a776a760d8fcedb902ff994b701c1') + '8768c080a8ceb0a52a3f866bd8ffc4b26f9deb97c6877ceea78ec0b316325a6b') package() { cd "$pkgname" - # TODO: Find a way to install in a better directory than /usr/local/plan9 + # Try the gentoo way for fixing hardcoded paths + PLAN9=/usr/lib/plan9 + grep --null -l -r '/usr/local/plan9' | xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g" - d=usr/local + d=usr/lib ./INSTALL -b install -Dm755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh" @@ -44,11 +46,11 @@ package() { rm -f config install.log install.sum install.txt configure Makefile INSTALL \ LICENSE - # Fix hardcoded paths - for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do - echo -n "\t$f" - [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true - done + # The old method for fixing hardcoded paths + #for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do + # echo -n "\t$f" + # [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true + #done # Fix python scripts find "$pkgdir" -name '*.py' -print0 |xargs -0 \ @@ -67,6 +69,11 @@ package() { gunzip "$i" fi done + + # Once more + #grep --null -l -r "$pkgdir/usr/local/plan9" | xargs --null sed -i "s!$pkgdir/usr/local/plan9!${PLAN9}!g" + grep --null -l -r "$pkgdir$PLAN9" | xargs --null sed -i "s!$pkgdir$PLAN9!${PLAN9}!g" || true + grep --null -l -r "/build/plan9port/pkg/plan9port/$PLAN9" | xargs --null sed -i "s!/build/plan9port/pkg/plan9port/$PLAN9!${PLAN9}!g" || true } # vim:set ts=2 sw=2 et: diff --git a/community/plan9port/plan9.sh b/community/plan9port/plan9.sh index 86109fc57..0cce7dc83 100644 --- a/community/plan9port/plan9.sh +++ b/community/plan9port/plan9.sh @@ -1,2 +1,4 @@ -export PLAN9=/usr/local/plan9 +export PLAN9=/usr/lib/plan9 export PATH=$PATH:$PLAN9/bin +export ROOTPATH=$ROOTPATH:$PLAN9/bin +export MANPATH=$MANPATH:$PLAN9/man diff --git a/community/python2-xapian/PKGBUILD b/community/python2-xapian/PKGBUILD index d6c8a1882..2b3a0b85d 100644 --- a/community/python2-xapian/PKGBUILD +++ b/community/python2-xapian/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 99157 2013-10-25 05:16:11Z fyan $ +# $Id: PKGBUILD 105927 2014-02-19 11:00:34Z fyan $ # Maintainer: Felix Yan # Contributor: DonVla # Contributor: Hervé Cauwelier pkgname=python2-xapian _realname=xapian-bindings -pkgver=1.2.15 +pkgver=1.2.17 epoch=1 -pkgrel=2 +pkgrel=1 pkgdesc="Python bindings for Xapian" arch=(i686 x86_64) url="http://xapian.org/docs/bindings/python/" license=('GPL') depends=('python2' "xapian-core=$epoch:$pkgver") -source=("http://oligarchy.co.uk/xapian/${pkgver}/${_realname}-$pkgver.tar.gz") +source=("http://oligarchy.co.uk/xapian/${pkgver}/${_realname}-${pkgver}.tar.xz") build() { - cd "$srcdir/${_realname}-$pkgver" + cd ${_realname}-$pkgver LDFLAGS=-lpython2.7 ./configure XAPIAN_CONFIG=/usr/bin/xapian-config \ --prefix=/usr --with-python \ @@ -26,10 +26,10 @@ build() { } package() { - cd "$srcdir/${_realname}-$pkgver" + cd ${_realname}-$pkgver make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: -sha512sums=('b3733308f0446fa041dcae677b3d3316bd8e775fcd1a1770ca2fab5b60e40463bbbce210cb1161161f6e9f1ff5e5473d38c2dab922b7f4f2705ac165d991c0ec') +sha512sums=('4c8348ece62b57c4442e8cb16282b7da2a8ebecaf99eefbb263795c1451f1395c2073ea311df0159e74a4d52029682034926526b17554627cf8e286f328f36a7') diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index 83df26b44..7bfbabc08 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 101482 2013-11-26 11:05:38Z spupykin $ +# $Id: PKGBUILD 105919 2014-02-19 10:21:57Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: William Rea # Contributor: Hans Janssen pkgname=simgear -pkgver=2.12.1 -pkgrel=2 +pkgver=3.0.0 +pkgrel=1 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." arch=(i686 x86_64) -depends=('glut' 'freealut' 'plib' 'openscenegraph') +depends=('glu' 'glut' 'freealut' 'plib' 'openscenegraph') makedepends=('boost' 'cmake' 'mesa') license=("GPL") #url="http://www.simgear.org" @@ -16,7 +16,7 @@ url="https://gitorious.org/fg" options=('!makeflags' 'staticlibs') #source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver") source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2") -md5sums=('8c483e13bce96f1dc27300a087fdb962') +md5sums=('097f55962dfc48b3e740334dbfda64a6') build() { cd $srcdir/simgear-$pkgver diff --git a/community/simgear/osg-3.2.patch b/community/simgear/osg-3.2.patch deleted file mode 100644 index 30d732ad6..000000000 --- a/community/simgear/osg-3.2.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -wbBur simgear-2.10.0/simgear/scene/material/EffectGeode.cxx simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx ---- simgear-2.10.0/simgear/scene/material/EffectGeode.cxx 2011-06-29 18:58:56.000000000 +0400 -+++ simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx 2013-07-25 16:14:24.268934729 +0400 -@@ -80,15 +80,15 @@ - int n = _effect->getGenerator(Effect::TANGENT); - tsg->generate(geometry, 0); // 0 is normal_unit, but I have no idea what that is! - if (n != -1 && !geometry->getVertexAttribArray(n)) -- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getTangentArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); -+ geometry->setVertexAttribArray(n, tsg->getTangentArray(), osg::Array::BIND_PER_VERTEX); - - n = _effect->getGenerator(Effect::BINORMAL); - if (n != -1 && !geometry->getVertexAttribArray(n)) -- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getBinormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); -+ geometry->setVertexAttribArray(n, tsg->getBinormalArray(), osg::Array::BIND_PER_VERTEX); - - n = _effect->getGenerator(Effect::NORMAL); - if (n != -1 && !geometry->getVertexAttribArray(n)) -- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getNormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); -+ geometry->setVertexAttribArray(n, tsg->getNormalArray(), osg::Array::BIND_PER_VERTEX); - } - } - diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD index 61b848898..88ba457e2 100644 --- a/community/xapian-core/PKGBUILD +++ b/community/xapian-core/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100301 2013-11-02 08:52:08Z spupykin $ +# $Id: PKGBUILD 105911 2014-02-19 08:50:20Z spupykin $ # Contributor: Andrea Scarpino # Contributor: Alexander Fehr # Contributor: William Rea @@ -6,8 +6,8 @@ pkgname=xapian-core epoch=1 -pkgver=1.2.15 -pkgrel=2 +pkgver=1.2.17 +pkgrel=1 pkgdesc='Open source search engine library.' arch=('i686' 'x86_64') url='http://www.xapian.org/' @@ -15,8 +15,8 @@ license=('GPL') depends=('sh' 'gcc-libs' 'zlib' 'util-linux') # xapian config requires libxapian.la options=('libtool') -source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('3af45069c6a14a7ecad2da24cbc3d2c5') +source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.xz") +md5sums=('493117bf45e5471e86b4fc5d6d8069dc') build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v1.2.3-54-g00ecf