diff options
60 files changed, 889 insertions, 206 deletions
diff --git a/community-staging/couchdb/PKGBUILD b/community-staging/couchdb/PKGBUILD new file mode 100644 index 000000000..3a6b16cb0 --- /dev/null +++ b/community-staging/couchdb/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 69031 2012-04-08 12:46:33Z stativ $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua +# Contributor: Michael Fellinger <m.fellinger@gmail.com> + +pkgname=couchdb +pkgver=1.2.0 +pkgrel=3 +pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" +arch=('i686' 'x86_64') +url="http://couchdb.apache.org" +license=('APACHE') +depends=('icu' 'erlang' 'js' 'openssl' 'curl') +install=couchdb.install +options=('!libtool') +backup=('etc/couchdb/local.ini' + 'etc/conf.d/couchdb' + 'etc/logrotate.d/couchdb') +source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc} + "rc-script.patch" "configure-fix.patch") +md5sums=('a5cbbcaac288831b3d8a08b725657f10' + '890a85b22219ea113a4901a289c442f8' + '8a3b1a1ff98a6411827ad991db7a355b' + 'fd1669544d08bda09c3318873d51db1e') + +build() { + cd "$srcdir/apache-$pkgname-$pkgver" + + # workaround for FS#26827 + patch -Np1 < $srcdir/configure-fix.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var + make + + patch -R etc/init/couchdb <$srcdir/rc-script.patch +} + +package() { + cd "$srcdir/apache-$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb + sed -i 's|\(CONFIGURATION_FILE=/etc/\)default\(/couchdb\)|\1conf.d\2|' $pkgdir/etc/rc.d/couchdb + sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb + + rm -rf $pkgdir/etc/default/ $pkgdir/var/run +} diff --git a/community-staging/couchdb/configure-fix.patch b/community-staging/couchdb/configure-fix.patch new file mode 100644 index 000000000..0bb68ecfe --- /dev/null +++ b/community-staging/couchdb/configure-fix.patch @@ -0,0 +1,21 @@ +diff -rup apache-couchdb-1.2.0/configure apache-couchdb-1.2.0.new/configure +--- apache-couchdb-1.2.0/configure 2012-03-29 23:05:41.000000000 +0200 ++++ apache-couchdb-1.2.0.new/configure 2012-04-08 13:50:14.923693056 +0200 +@@ -18234,7 +18234,7 @@ echo "$as_me: error: $erlang_version_err + fi + fi + +-otp_release="`${ERL} -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`" ++otp_release="`${ERL} -smp disable -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`" + + if test x$otp_release \> xR13B03; then + USE_OTP_NIFS_TRUE= +@@ -18253,7 +18253,7 @@ else + fi + + +-has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop` ++has_crypto=`${ERL} -smp disable -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop` + + if test -n "$has_crypto"; then + { { echo "$as_me:$LINENO: error: Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?" >&5 diff --git a/community-staging/couchdb/couchdb.install b/community-staging/couchdb/couchdb.install new file mode 100644 index 000000000..5eff459c7 --- /dev/null +++ b/community-staging/couchdb/couchdb.install @@ -0,0 +1,22 @@ +post_install() { + id couchdb &>/dev/null || \ + useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb + mkdir -p /var/run/couchdb + chown -R couchdb.daemon /etc/couchdb + chown -R couchdb.daemon /var/{lib,log,run}/couchdb +} + +pre_upgrade() { + id couchdb &>/dev/null || \ + useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb +} + +post_upgrade() { + mkdir -p $pkgdir/var/run/couchdb + chown -R couchdb.daemon /etc/couchdb + chown -R couchdb.daemon /var/{lib,log,run}/couchdb +} + +post_remove() { + userdel couchdb &>/dev/null +} diff --git a/community-staging/couchdb/rc-script.patch b/community-staging/couchdb/rc-script.patch new file mode 100644 index 000000000..1dd723ffc --- /dev/null +++ b/community-staging/couchdb/rc-script.patch @@ -0,0 +1,57 @@ +--- couchdb 2011-12-27 01:21:59.000000000 +0400 ++++ couchdb.my 2011-12-27 01:21:18.000000000 +0400 +@@ -1,6 +1,4 @@ +-#!/bin/bash +-. /etc/rc.conf +-. /etc/rc.d/functions ++#!/bin/sh -e + + # Licensed under the Apache License, Version 2.0 (the "License"); you may not + # use this file except in compliance with the License. You may obtain a copy of +@@ -31,7 +29,7 @@ + NAME=couchdb + SCRIPT_NAME=`basename $0` + COUCHDB=/usr/bin/couchdb +-CONFIGURATION_FILE=/etc/conf.d/couchdb ++CONFIGURATION_FILE=/etc/default/couchdb + RUN_DIR=/var/run/couchdb + LSB_LIBRARY=/lib/lsb/init-functions + +@@ -44,14 +42,16 @@ + fi + + log_daemon_msg () { +- stat_busy $@ ++ # Dummy function to be replaced by LSB library. ++ ++ echo $@ + } + + log_end_msg () { ++ # Dummy function to be replaced by LSB library. ++ + if test "$1" != "0"; then +- stat_fail +- else +- stat_done ++ echo "Error with $DESCRIPTION: $NAME" + fi + return $1 + } +@@ -66,7 +66,7 @@ + command="$command $COUCHDB_OPTIONS" + fi + if test -n "$COUCHDB_USER"; then +- if su $COUCHDB_USER -s /bin/bash -c "$command"; then ++ if su $COUCHDB_USER -c "$command"; then + return $SCRIPT_OK + else + return $SCRIPT_ERROR +@@ -84,7 +84,6 @@ + # Start Apache CouchDB as a background process. + + mkdir -p "$RUN_DIR" +- chown -R $COUCHDB_USER "$RUN_DIR" + command="$COUCHDB -b" + if test -n "$COUCHDB_STDOUT_FILE"; then + command="$command -o $COUCHDB_STDOUT_FILE" diff --git a/community-staging/erlang/PKGBUILD b/community-staging/erlang/PKGBUILD index 651be0c36..fe325f94c 100644 --- a/community-staging/erlang/PKGBUILD +++ b/community-staging/erlang/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68414 2012-03-24 10:06:33Z lfleischer $ +# $Id: PKGBUILD 69035 2012-04-08 13:25:46Z stativ $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com> pkgname=erlang -pkgver=R15B +pkgver=R15B01 pkgrel=1 pkgdesc='A small concurrent functional programming language developed by Ericsson.' arch=(i686 x86_64) @@ -20,8 +20,8 @@ optdepends=('wxgtk: for wx support' options=('!makeflags') source=("http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz") -md5sums=('dd6c2a4807551b4a8a536067bde31d73' - '9738da523737712a9db87db0dee05338') +md5sums=('f12d00f6e62b36ad027d6c0c08905fad' + 'd87412c2a1e6005bbe29dfe642a9ca20') build() { cd "$srcdir/otp_src_${pkgver/./-}" @@ -33,7 +33,7 @@ build() { sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support \ - --enable-threads -enable-native-libs + --enable-threads make } diff --git a/community-staging/esdl/PKGBUILD b/community-staging/esdl/PKGBUILD new file mode 100644 index 000000000..1324daaee --- /dev/null +++ b/community-staging/esdl/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: kappa <kappacurve@gmail.com> + +pkgname=esdl +pkgver=1.0.1 +pkgrel=2 +epoch=2 +arch=('x86_64' 'i686') +pkgdesc="SDL and OpenGL bindings for the Erlang programming language" +url="http://esdl.sourceforge.net/" +license=('custom') +depends=('erlang' 'sdl' 'mesa') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.src.tar.gz") +md5sums=('50230ea81418cb029281a70627a5dd8e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + find -type f -print0 | xargs -0 chmod 644 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" install + + ## To make wings3d compile with esdl 1.2 + #ln -s /usr/lib/erlang/lib/wx-0.99/include/glu.hrl \ + # "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/glu.hrl" + #ln -s /usr/lib/erlang/lib/wx-0.99/include/gl.hrl \ + # "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/gl.hrl" + + install -Dm644 "$srcdir/$pkgname-$pkgver/license.terms" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/wings3d/PKGBUILD b/community-staging/wings3d/PKGBUILD new file mode 100644 index 000000000..ead5b9e68 --- /dev/null +++ b/community-staging/wings3d/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: kappa <kappacurve@gmail.com> + +pkgname=wings3d +_pkgname=wings +pkgver=1.4.1 +pkgrel=6 +pkgdesc="3D modeling program" +arch=('x86_64' 'i686') +url="http://www.wings3d.com/" +license=('GPL') +depends=('esdl' 'bash' 'desktop-file-utils') +makedepends=('setconf' 'gendesk') +optdepends=('povray: rendering support via POV-Ray') +# 'kerkythea: rendering support via Kerkythea' +replaces=('wings' 'wings-devel') +install=$pkgname.install +source=("http://downloads.sourceforge.net/wings/$_pkgname-$pkgver.tar.bz2" + "$pkgname" + "$pkgname.png") +sha256sums=('51aea431e18935e5634ea673caa945f586db2203855554d8dcab5e9545f2789a' + '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' + 'ad49fded5e503131ee0e2e03a6db0974aa60f50e1ec6cd697fcacef126c40f52') +_genericname=('3D Modeler') + +build() { + cd "$srcdir" + gendesk + setconf "$pkgname.desktop" Categories "Graphics;3DGraphics;" + + cd "$_pkgname-$pkgver" + export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*) + make + make lang +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + mkdir -p "$pkgdir/usr/lib/$pkgname" + for subdir in ebin fonts patches plugins shaders textures; do + cp -r "$srcdir/$_pkgname-$pkgver/$subdir/" "$pkgdir/usr/lib/$pkgname" + done + + install -D -m 755 "$srcdir/wings3d" "$pkgdir/usr/bin/wings3d" + install -D -m 644 "$srcdir/wings3d.desktop" \ + "$pkgdir/usr/share/applications/wings3d.desktop" + install -D -m 644 "$srcdir/wings3d.png" \ + "$pkgdir/usr/share/pixmaps/wings3d.png" + install -D -m 644 license.terms \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/wings3d/wings3d b/community-staging/wings3d/wings3d new file mode 100644 index 000000000..c0fd3b2fb --- /dev/null +++ b/community-staging/wings3d/wings3d @@ -0,0 +1,2 @@ +#!/bin/sh +erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"} diff --git a/community-staging/wings3d/wings3d.install b/community-staging/wings3d/wings3d.install new file mode 100644 index 000000000..98f3ea190 --- /dev/null +++ b/community-staging/wings3d/wings3d.install @@ -0,0 +1,14 @@ +post_upgrade() { + #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/wings3d/wings3d.png b/community-staging/wings3d/wings3d.png Binary files differnew file mode 100644 index 000000000..45a1140bf --- /dev/null +++ b/community-staging/wings3d/wings3d.png diff --git a/community-testing/libgexiv2/PKGBUILD b/community-testing/libgexiv2/PKGBUILD new file mode 100644 index 000000000..7c14862b8 --- /dev/null +++ b/community-testing/libgexiv2/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 69056 2012-04-08 20:39:15Z jelle $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=libgexiv2 +pkgver=0.4.1 +pkgrel=2 +pkgdesc="GObject-based wrapper around the Exiv2 library." +arch=('i686' 'x86_64') +url="http://redmine.yorba.org/projects/gexiv2" +license=('GPL2') +depends=('exiv2' 'glib2') +options=('!libtool') +source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('b74cd19a4cf4a4a32a938ecb267974c29e630dc2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 5111715b2..79ac592da 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -4,16 +4,16 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.14.2 +pkgver=1.15.0 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') url='http://aria2.sourceforge.net/' license=('GPL') -depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') +depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") -md5sums=('19b1a9f83a09c6ef5c7ab87e4e0f7974') +md5sums=('a381b8a0fe2d71f726187237ac6de82d') build() { cd aria2-${pkgver} @@ -35,4 +35,10 @@ package() { cd aria2-${pkgver} make DESTDIR=${pkgdir} install + + # add bash completion (aria2 automatically installs to a temporary target directory) + install -d ${pkgdir}/usr/share/bash-completion/completions + install -m644 ${pkgdir}/usr/share/doc/aria2/bash_completion/aria2c \ + ${pkgdir}/usr/share/bash-completion/completions + rm -rf ${pkgdir}/usr/share/doc/aria2/bash_completion } diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index 18ca7041a..084182dfa 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68377 2012-03-23 13:38:01Z seblu $ +# $Id: PKGBUILD 69079 2012-04-08 23:33:54Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=bird pkgname=('bird' 'bird6') pkgver=1.3.7 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://bird.network.cz/' license=('GPL2') @@ -52,7 +52,7 @@ package_bird () { install -D -m 755 "$srcdir/bird.rc" "$pkgdir/etc/rc.d/bird" install -D -m 644 "$srcdir/bird.conf" "$pkgdir/etc/conf.d/bird" # systemd file - install -D -m 644 "$srcdir/bird.service" "$pkgdir/lib/systemd/system/bird.service" + install -D -m 644 "$srcdir/bird.service" "$pkgdir/usr/lib/systemd/system/bird.service" } package_bird6 () { @@ -71,7 +71,7 @@ package_bird6 () { install -D -m 644 "$srcdir/bird.conf" "$pkgdir/etc/conf.d/bird6" sed -i 's/bird/bird6/' "$pkgdir/etc/rc.d/bird6" # systemd config file - install -D -m 644 "$srcdir/bird6.service" "$pkgdir/lib/systemd/system/bird6.service" + install -D -m 644 "$srcdir/bird6.service" "$pkgdir/usr/lib/systemd/system/bird6.service" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index aaa13e93f..30efba6ed 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 59246 2011-11-21 21:28:58Z giovanni $ +# $Id: PKGBUILD 69070 2012-04-08 22:56:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid -pkgver=1.4.5 -pkgrel=2 +pkgver=1.4.6 +pkgrel=1 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64') url="http://pcsclite.alioth.debian.org/ccid.html" license=('LGPL' 'GPL') -depends=('pcsclite') +depends=('pcsclite' 'libusb') makedepends=('pkg-config') backup=(etc/reader.conf.d/libccidtwin) -source=("https://alioth.debian.org/frs/download.php/3672/${pkgname}-${pkgver}.tar.bz2") -md5sums=('cb9a77194ac335c39b262ea83a5b7d2e') +source=("https://alioth.debian.org/frs/download.php/3711/${pkgname}-${pkgver}.tar.bz2") +md5sums=('3600dfbc74efb321c37de15a64efbbe6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index b2dd28916..1d413f207 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67882 2012-03-15 16:59:01Z lcarlier $ +# $Id: PKGBUILD 69020 2012-04-08 08:25:21Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.99.08 -pkgrel=3 +pkgver=1.99.09 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" @@ -15,15 +15,14 @@ makedepends=('python2') source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver chmsee) install=chmsee.install -md5sums=('9e54b72761f8e97e683c03e52ac1ac6c' - 'abc127caca8bccf9ac51cf937b75d0c2') +md5sums=('f0ee2a87ffd3f6667d88eb89c31387e4' + '242a9390bc943cc38237fa71137fb26c') build() { cd ${srcdir}/jungleji-chmsee-*/src cp Makefile.arch Makefile - #sed -i -e 's/python/python2/g' common.mk - sed -i -e 's/10.*/11.*/g' ../application.ini + #sed -i -e 's/10.*/11.*/g' ../application.ini make } diff --git a/community/chmsee/chmsee b/community/chmsee/chmsee index d11f9c740..65a1e195b 100644 --- a/community/chmsee/chmsee +++ b/community/chmsee/chmsee @@ -1,4 +1,4 @@ #!/bin/sh cd /usr/share/chmsee/ -xulrunner /usr/share/chmsee/application.ini $@ +xulrunner /usr/share/chmsee/application.ini "$@" cd - diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD index 435047626..970a0d180 100644 --- a/community/drbd/PKGBUILD +++ b/community/drbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68283 2012-03-21 09:58:34Z seblu $ +# $Id: PKGBUILD 69076 2012-04-08 23:26:43Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=drbd pkgver=8.3.11 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc='Userland tools for drbd block devices' url='http://www.drbd.org' @@ -13,7 +13,7 @@ source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz" '01-remove-old-sanity-check.diff') backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') md5sums=('e47a35a80143b72e9708844efbe2e608' - '19236c6fe7a8c9191d67a4df15892b78' + '6a91609fcd69b435a2a96599f07ad856' '24144d23b31f9ce66929fe989247c779') build() { @@ -41,20 +41,21 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - - # move udev files to the right place - install -d -m 755 "$pkgdir/lib" - mv "$pkgdir/etc/udev" "$pkgdir/lib" - - # move bash completion in right place + # move forced /sbin binaries and fix harcoded path + mv "$pkgdir/sbin"/* "$pkgdir/usr/sbin" + rmdir "$pkgdir/sbin" + sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' \ + "$pkgdir/etc/udev/rules.d/65-drbd.rules" + # move udev files + mv "$pkgdir/etc/udev" "$pkgdir/usr/lib" + # move bash completion install -d -m 755 "$pkgdir/usr/share/bash-completion" - mv "$pkgdir/etc/bash_completion.d" "$pkgdir/usr/share/bash-completion/completions" - + mv "$pkgdir/etc/bash_completion.d" \ + "$pkgdir/usr/share/bash-completion/completions" # remove /var/lock rmdir "$pkgdir/var/lock" - - # replace - install -D -m 755 "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname" + # setup initscript (replace) + install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/drbd/drbd.rc b/community/drbd/drbd.rc index 7aca1f394..893ce3e20 100644 --- a/community/drbd/drbd.rc +++ b/community/drbd/drbd.rc @@ -4,7 +4,7 @@ . /etc/rc.conf . /etc/rc.d/functions -DRBDADM='/sbin/drbdadm' +DRBDADM='/usr/sbin/drbdadm' PROC_DRBD='/proc/drbd' check_config() { @@ -50,7 +50,7 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 5e14159e5..dcd050176 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 69006 2012-04-07 17:03:44Z lcarlier $ +# $Id: PKGBUILD 69042 2012-04-08 17:05:00Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' - 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' - 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' + 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' + 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=3.0.0 -pkgrel=5 +pkgver=3.1.0 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -23,11 +23,12 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' - 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') + 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' + 'gsl') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('f2c51e18b67ae6b21065ea0aed9b588e' +md5sums=('e41982c83e8b27bd2cba8fe8c173b979' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29') @@ -551,6 +552,24 @@ package_gambas3-gb-gtk() { ## } +package_gambas3-gb-gsl() { + depends=('gambas3-runtime' 'gsl') + pkgdesc="The GNU Scientific Library component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + package_gambas3-gb-gui() { depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') pkgdesc="Automatic gui toolkit chooser" diff --git a/community/gnome-subtitles/PKGBUILD b/community/gnome-subtitles/PKGBUILD new file mode 100644 index 000000000..b2f9fc5d9 --- /dev/null +++ b/community/gnome-subtitles/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 69058 2012-04-08 21:20:04Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=gnome-subtitles +pkgver=1.2 +pkgrel=3 +pkgdesc="Video subtitle editor for GNOME" +arch=('i686' 'x86_64') +url="http://gnomesubtitles.org/" +license=('GPL') +depends=('gstreamer0.10-base-plugins' 'gconf-sharp' 'gtkspell' 'desktop-file-utils') +makedepends=('intltool' 'gnome-doc-utils') +optdepends=('gstreamer0.10-good-plugins: Extra media codecs' + 'gstreamer0.10-bad-plugins: Extra media codecs' + 'gstreamer0.10-ugly-plugins: Extra media codecs' + 'gstreamer0.10-ffmpeg: Extra media codecs') +options=('!libtool') +install=$pkgname.install +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + fix-help.patch) +md5sums=('b7f3175b7a189471821d809171121d62' + '7645bc18812ea52137adddd6e87942d5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix-help.patch" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-install --disable-scrollkeeper \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/gnome-subtitles/fix-help.patch b/community/gnome-subtitles/fix-help.patch new file mode 100644 index 000000000..e888bfb41 --- /dev/null +++ b/community/gnome-subtitles/fix-help.patch @@ -0,0 +1,31 @@ +From 0b66f14b812bb83ca149bc29906716c17f388da1 Mon Sep 17 00:00:00 2001 +From: Pedro Castro <pedro@gnomesubtitles.org> +Date: Sat, 10 Mar 2012 11:32:28 +0000 +Subject: Fix #671567 (Fix opening help), based on a patch from György Balló. + +Fix keyboard shortcuts url. +--- +diff --git a/src/GnomeSubtitles/Core/EventHandlers.cs b/src/GnomeSubtitles/Core/EventHandlers.cs +index 014fc54..6de82b0 100644 +--- a/src/GnomeSubtitles/Core/EventHandlers.cs ++++ b/src/GnomeSubtitles/Core/EventHandlers.cs +@@ -392,15 +392,11 @@ public class EventHandlers { + /* Help Menu */ + + public void OnHelpContents (object o, EventArgs args) { +- const string arg = "ghelp:gnome-subtitles"; +- if ((!Util.OpenUrl("gnome-help " + arg)) && (!Util.OpenUrl("yelp " + arg))) { +- BasicErrorDialog errorDialog = new BasicErrorDialog(Catalog.GetString("The Gnome Subtitles Manual could not be found."), Catalog.GetString("Please verify that your installation has been completed successfully.")); +- errorDialog.Show(); +- } ++ Util.OpenUrl("ghelp:gnome-subtitles"); + } + + public void OnHelpKeyboardShortcuts (object o, EventArgs args) { +- Util.OpenUrl("http://gnome-subtitles.sourceforge.net/shortcuts"); ++ Util.OpenUrl("http://gnomesubtitles.org/shortcuts"); + } + + public void OnHelpRequestFeature (object o, EventArgs args) { +-- +cgit v0.9.0.2 diff --git a/community/gnome-subtitles/gnome-subtitles.install b/community/gnome-subtitles/gnome-subtitles.install new file mode 100644 index 000000000..adb0ba085 --- /dev/null +++ b/community/gnome-subtitles/gnome-subtitles.install @@ -0,0 +1,22 @@ +pkgname=gnome-subtitles + +post_install() { + gconfpkg --install $pkgname + update-desktop-database -q +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall $pkgname +} + +post_remove() { + update-desktop-database -q +} diff --git a/community/hitori/PKGBUILD b/community/hitori/PKGBUILD new file mode 100644 index 000000000..99afb9dd3 --- /dev/null +++ b/community/hitori/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 69054 2012-04-08 19:56:12Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=hitori +pkgver=0.3.2 +pkgrel=1 +pkgdesc="GTK+ application to generate and let you play games of Hitori" +arch=('i686' 'x86_64') +url="https://live.gnome.org/Hitori" +license=('GPL') +depends=('gtk3' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool' 'gnome-doc-utils') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9e72bb0c84b0e0b66a96fcee6918cf15832f45458df4d8dd5f8091a20bba4350') + +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/hitori/hitori.install b/community/hitori/hitori.install new file mode 100644 index 000000000..2c455e952 --- /dev/null +++ b/community/hitori/hitori.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/ipvsadm/PKGBUILD b/community/ipvsadm/PKGBUILD index 94a0e668c..a8126aca1 100644 --- a/community/ipvsadm/PKGBUILD +++ b/community/ipvsadm/PKGBUILD @@ -1,43 +1,47 @@ -# $Id: PKGBUILD 66312 2012-02-23 14:03:04Z allan $ +# $Id: PKGBUILD 69082 2012-04-09 02:20:59Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ipvsadm pkgver=1.26 -pkgrel=3 +pkgrel=4 pkgdesc='The IP Virtual Server administration utility' arch=('i686' 'x86_64') url='http://www.linuxvirtualserver.org/software/ipvs.html' license=('GPL2') depends=('libnl1' 'popt') backup=('etc/conf.d/ipvsadm') -#options=('!makeflags') source=("http://www.linuxvirtualserver.org/software/kernel-2.6/$pkgname-$pkgver.tar.gz" 'ipvsadm.rc' 'ipvsadm.conf' 'ipvsadm.rules' '01-fix-not-showing-all-server.patch') md5sums=('eac3ba3f62cd4dea2da353aeddd353a8' - '0e106fce0675e014bea0f9355b947bd6' + '89b15096bb243dc694b6c5d4200561fd' 'cd358130967a9cc0d31fc61282df43e7' 'cd6649c647e495d4d6f981542ce5a93b' 'e9fb77d2fbe2d3f41d60257316338543') build() { - cd ${pkgname}-${pkgver} + cd $pkgname-$pkgver patch -p1 -i ../01-fix-not-showing-all-server.patch - make INCLUDE="-I/usr/src/linux-`uname -r`/include -I.. -I." || return 1 + make INCLUDE="-I/usr/src/linux-$(uname -r)/include -I.. -I." } package() { - cd ${pkgname}-${pkgver} - make BUILD_ROOT=${pkgdir} MANDIR=usr/share/man INIT="$pkgdir/etc/rc.d" install + cd $pkgname-$pkgver + make \ + BUILD_ROOT="$pkgdir" \ + MANDIR=usr/share/man \ + SBIN="$pkgdir/usr/sbin" \ + INIT="$pkgdir/etc/rc.d" \ + install cd "$srcdir" # add initscripts - install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" - install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" + install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" # add ipvsadm rules - install -D -m 644 $pkgname.rules "${pkgdir}/etc/$pkgname.rules" + install -D -m 644 $pkgname.rules "$pkgdir/etc/$pkgname.rules" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/ipvsadm.rc b/community/ipvsadm/ipvsadm.rc index 91ed32e3b..5a9614106 100644 --- a/community/ipvsadm/ipvsadm.rc +++ b/community/ipvsadm/ipvsadm.rc @@ -7,7 +7,7 @@ case "$1" in start) stat_busy 'Loading IPVS table' - if [[ -f $IPVSADM_CONF ]] && /sbin/ipvsadm-restore < "$IPVSADM_CONF"; then + if [[ -f $IPVSADM_CONF ]] && ipvsadm-restore < "$IPVSADM_CONF"; then add_daemon ipvsadm stat_done else @@ -15,7 +15,7 @@ case "$1" in fi ;; stop) - status 'Clearing IPVS table' /sbin/ipvsadm -C + status 'Clearing IPVS table' ipvsadm -C rm_daemon ipvsadm ;; restart) @@ -25,7 +25,7 @@ case "$1" in ;; save) stat_busy 'Saving IPVS table' - if /sbin/ipvsadm-save -n > "$IPVSADM_CONF" 2>/dev/null; then + if ipvsadm-save -n > "$IPVSADM_CONF" 2>/dev/null; then stat_done else stat_fail diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index 7a34c23b4..01e488c1b 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 66946 2012-03-02 16:54:51Z bpiotrowski $ +# $Id: PKGBUILD 69022 2012-04-08 09:21:56Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu -pkgver=0.11.1 +pkgver=0.11.2 pkgrel=1 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" arch=('i686' 'x86_64') url="http://www.kadu.net/" license=('GPL') -depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit') +depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit' 'xdg-utils') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') +install=kadu.install source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('30c239876fd0fd4eadb874c3cb2ebe10') +md5sums=('ddfe05f1c947e9ff897f37804ecbd7d4') build() { cd "$srcdir" diff --git a/community/kadu/kadu.install b/community/kadu/kadu.install new file mode 100644 index 000000000..f32ae9d17 --- /dev/null +++ b/community/kadu/kadu.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index bbf7b14d2..c7e58b150 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68213 2012-03-19 11:50:40Z seblu $ +# $Id: PKGBUILD 69068 2012-04-08 22:52:23Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=linux-tools @@ -6,7 +6,7 @@ pkgname=('perf' 'cpupower') pkgver=3.3 kernver=${pkgver} [[ ${kernver##*rc} != $kernver ]] && testing='testing' -pkgrel=1 +pkgrel=2 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -51,18 +51,18 @@ package_cpupower() { depends=('pciutils') conflicts=('cpufrequtils') - # install rc.d script - install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower" - install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower" - install -D -m 644 cpupower.service "$pkgdir/lib/systemd/system/cpupower.service" - cd linux-$kernver/tools/power/cpupower make \ DESTDIR="$pkgdir" \ - INSTALL='/bin/install -c' \ mandir='/usr/share/man' \ docdir='/usr/share/doc/cpupower' \ install install-man + # install rc.d script + cd "$srcdir" + install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower" + install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower" + install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service" + } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/love/PKGBUILD b/community/love/PKGBUILD index 68bb4d8ce..0fc743ccc 100644 --- a/community/love/PKGBUILD +++ b/community/love/PKGBUILD @@ -3,20 +3,20 @@ # Contributor: Eric Forgeot < http://anamnese.online.fr >, dreeze pkgname=love pkgver=0.8.0 -pkgrel=1 -pkgdesc="An open-source 2D game engine which uses the versatile Lua scripting language to create dynamic gaming experiences." +pkgrel=2 +pkgdesc="An open-source 2D game engine which uses the versatile Lua scripting language to create dynamic gaming experiences" arch=(i686 x86_64) url="http://love2d.org/" license=('zlib') depends=('luajit' 'physfs' 'freetype2' 'devil' 'mpg123' 'openal' 'libvorbis' 'libmodplug' 'sdl' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils') install=love.install -source=("https://bitbucket.org/rude/love/get/e0f98d53debb.tar.bz2" +source=("https://bitbucket.org/rude/love/downloads/love-${pkgver}-linux-src.tar.gz" "https://bitbucket.org/rude/love/raw/$pkgver/license.txt" "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/app.svg" "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/game.svg" "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/love.desktop" "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/love.xml") -md5sums=('e21fa52d906f9f5f76dfbb0ce6b60121' +md5sums=('9db9c32585fc7c7da3eba7e438783099' 'a4890908149d91bc042b30d00c121c58' 'a1e19f91420cc519a683af360f5b1120' '16f2ecc899c9ffc8b7b7c807f8967861' @@ -24,14 +24,15 @@ md5sums=('e21fa52d906f9f5f76dfbb0ce6b60121' 'b4f00fb1cb80057a0a371a994100d418') build() { - cd "$srcdir"/rude-love-* - ./platform/unix/automagic + cd "$srcdir"/love-$pkgver + #./platform/unix/automagic ./configure --prefix=/usr --with-luajit #LDFLAGS="$LDFLAGS -Wl,--no-as-needed" make } package() { - cd "$srcdir"/rude-love-* + cd "$srcdir"/love-$pkgver + make DESTDIR="$pkgdir" install mkdir -p "$pkgdir/usr/share/licenses/$pkgname" diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD index b973aa694..b79032d06 100644 --- a/community/ncmpcpp/PKGBUILD +++ b/community/ncmpcpp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68325 2012-03-21 19:23:07Z bpiotrowski $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 69024 2012-04-08 09:31:15Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Army <uli[dot]armbruster[at]gmail[dot]com> pkgname=ncmpcpp -pkgver=0.5.9 +pkgver=0.5.10 pkgrel=1 pkgdesc="An almost exact clone of ncmpc with some new features." arch=('i686' 'x86_64') @@ -13,16 +13,16 @@ license=('GPL') depends=('curl' 'libmpdclient' 'taglib' 'ncurses') install=ncmpcpp.install source=(http://unkart.ovh.org/ncmpcpp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('07f62d6574d0dcc99cad84adb9754203') +md5sums=('298ed66325bcfe358e37e186c7ea4861') build() { cd "$srcdir/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-unicode \ - --enable-clock \ - --with-taglib \ - --enable-outputs \ - --with-curl + ./configure --prefix=/usr \ + --enable-unicode \ + --enable-clock \ + --with-taglib \ + --enable-outputs \ + --with-curl make } diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index b7371be87..714495250 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68679 2012-03-31 14:28:34Z giovanni $ +# $Id: PKGBUILD 69074 2012-04-08 23:10:15Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite pkgver=1.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64') url="https://alioth.debian.org/projects/pcsclite/" @@ -25,7 +25,7 @@ build() { --sysconfdir=/etc \ --enable-ipcdir=/run/pcscd \ --enable-usbdropdir=/usr/lib/pcsc/drivers \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system make } diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index f995de0ae..f70330c26 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67688 2012-03-13 21:44:10Z seblu $ +# $Id: PKGBUILD 69072 2012-04-08 22:59:52Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd pkgver=1.8.5 -pkgrel=2 +pkgrel=3 pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' license=('custom') @@ -17,10 +17,9 @@ source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" "$pkgname.conf" "$pkgname.service") sha1sums=('344c145bd29938b7eefb0210cf92bf18df3e191d' - '9acb452eede739ca6ce42c9470e8bf258a3dddf4' + 'efe02c38eac45bed065fd48c1e3e7753c90c7c2a' '63ce41d790a0472e6b3b15928f6a71d1dbb7700d' '9cb6b2eaaf445fe8d17dfc50fde15709d4de7d1d') - build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --with-pidfile=/run/radvd.pid \ @@ -42,7 +41,7 @@ package() { install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname" install -D -m 644 ../$pkgname.conf "$pkgdir/etc/conf.d/$pkgname" install -D -m 644 ../$pkgname.service \ - "$pkgdir/lib/systemd/system/$pkgname.service" + "$pkgdir/usr/lib/systemd/system/$pkgname.service" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/radvd/radvd.rc b/community/radvd/radvd.rc index fdd9ee8ce..26ad0dbf4 100644 --- a/community/radvd/radvd.rc +++ b/community/radvd/radvd.rc @@ -8,7 +8,10 @@ NAME='IPv6 Router Advertisement Daemon' DAEMON=/usr/sbin/radvd PIDFILE=${PIDFILE:-/run/${0##*/}.pid} DAEMON_OPTS+=("--pidfile=$PIDFILE") -[[ -r "$PIDFILE" ]] && read PID < "$PIDFILE" + +# check pid file +[[ -r "$PIDFILE" ]] && + read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID || unset PID case "$1" in start) diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index c79ca4bec..f03b6d279 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 68509 2012-03-26 09:56:23Z schiv $ +# $Id: PKGBUILD 69027 2012-04-08 10:57:34Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=vhba-module pkgver=20110915 -_extramodules=extramodules-3.2-ARCH -pkgrel=5 +_extramodules=extramodules-3.3-ARCH +pkgrel=6 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('linux>=3.2' 'linux<3.3') -makedepends=('linux-headers>=3.2') +depends=('linux>=3.3' 'linux<3.4') +makedepends=('linux-headers>=3.3') install=$pkgname.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" '60-vhba.rules') diff --git a/community/windowlab/PKGBUILD b/community/windowlab/PKGBUILD index d126cc250..f2bf963fc 100644 --- a/community/windowlab/PKGBUILD +++ b/community/windowlab/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67590 2012-03-13 12:48:45Z giovanni $ +# $Id: PKGBUILD 69029 2012-04-08 11:16:33Z giovanni $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: phrakture <aaronmgriffin -at- gmail.dot.com> @@ -6,7 +6,7 @@ pkgname=windowlab pkgver=1.40 -pkgrel=2 +pkgrel=3 pkgdesc="A small and simple window manager." arch=('i686' 'x86_64') url="http://www.nickgravgaard.com/windowlab" @@ -16,11 +16,13 @@ source=("http://www.nickgravgaard.com/windowlab/${pkgname}-${pkgver}.tar") md5sums=('346f8c187838a446b4cbb2326d035577') build() { - cd ${srcdir}/${pkgname}-${pkgver} - make PREFIX=/usr + cd ${srcdir}/${pkgname}-${pkgver} + + make PREFIX=/usr } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make PREFIX=/usr CONFPREFIX="" MANDIR=${pkgdir}/usr/share/man DESTDIR=${pkgdir} install + cd ${srcdir}/${pkgname}-${pkgver} + + make PREFIX=/usr CONFPREFIX="" MANDIR=${pkgdir}/usr/share/man/man1 DESTDIR=${pkgdir} install } diff --git a/core/dirmngr/PKGBUILD b/core/dirmngr/PKGBUILD index 24ee2ea26..40e0c74fc 100644 --- a/core/dirmngr/PKGBUILD +++ b/core/dirmngr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146749 2012-01-16 22:52:57Z dreisner $ +# $Id: PKGBUILD 155870 2012-04-08 07:13:40Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=dirmngr pkgver=1.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="A daemon to handle CRL and certificate requests" arch=('i686' 'x86_64') license=('GPL') @@ -14,8 +14,17 @@ install=dirmngr.install build() { cd $srcdir/$pkgname-$pkgver + # FIX for https://bugzilla.redhat.com/565131 + # not sure how best to turn this into something more upstreamable + # patch configure to try this combo first? -- Rex + # https://bugs.archlinux.org/task/28606 + export LDAPLIBS="-lldap -llber" ./configure --prefix=/usr --libexecdir=/usr/lib make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } md5sums=('f2570f0248f5947daac200e85291b328') diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 02876b468..34a6c086f 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150782 2012-02-22 03:38:27Z bisson $ +# $Id: PKGBUILD 155887 2012-04-08 22:28:42Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=1 +pkgrel=2 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') @@ -22,7 +22,8 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' 'nss-mdns: NSS support for mDNS') makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 'gobject-introspection' 'gtk3') -backup=('etc/avahi/avahi-daemon.conf' +backup=('etc/avahi/hosts' + 'etc/avahi/avahi-daemon.conf' 'etc/avahi/services/ssh.service' 'etc/avahi/services/sftp-ssh.service') source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" @@ -59,7 +60,7 @@ build() { --with-avahi-priv-access-group=network \ --with-autoipd-user=avahi \ --with-autoipd-group=avahi \ - --with-systemdsystemunitdir=/lib/systemd/system \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ make } diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 8b2d98ebc..7cb36e082 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150687 2012-02-20 07:58:47Z bisson $ +# $Id: PKGBUILD 155885 2012-04-08 22:21:02Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -8,7 +8,7 @@ pkgname=bitlbee pkgver=3.0.5 -pkgrel=2 +pkgrel=3 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') @@ -40,7 +40,7 @@ build() { --etcdir=/etc/bitlbee \ --pidfile=/var/run/bitlbee/bitlbee.pid \ --ipcsocket=/var/run/bitlbee/bitlbee.sock \ - --systemdsystemunitdir=/lib/systemd/system \ + --systemdsystemunitdir=/usr/lib/systemd/system \ --ssl=openssl \ --strip=0 \ --otr=plugin \ diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 0d9eb307b..76f899f0c 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 152257 2012-03-06 04:01:25Z dreisner $ +# $Id: PKGBUILD 155881 2012-04-08 20:56:39Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq pkgver=2.60 -pkgrel=2 +pkgrel=3 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64') @@ -45,7 +45,7 @@ package() { install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf - install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service + install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/kino/PKGBUILD b/extra/kino/PKGBUILD index 2a9681e31..6158c33ee 100644 --- a/extra/kino/PKGBUILD +++ b/extra/kino/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 141101 2011-10-23 23:38:04Z andrea $ +# $Id: PKGBUILD 155907 2012-04-09 00:36:43Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=kino pkgver=1.3.4 -pkgrel=4 +pkgrel=5 pkgdesc="A non-linear DV editor" arch=('i686' 'x86_64') url="http://www.kinodv.org/" license=('GPL') -depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm') +depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm' 'desktop-file-utils') makedepends=('intltool' 'v4l-utils') options=('!libtool') install=kino.install @@ -24,7 +24,7 @@ build() { patch -p1 -i "${srcdir}"/videodev-header.patch ./configure --prefix=/usr \ - --with-udev-rules-dir=/lib/udev/rules.d + --with-udev-rules-dir=/usr/lib/udev/rules.d make } diff --git a/extra/libtar/PKGBUILD b/extra/libtar/PKGBUILD index 3c47ca2e9..e1b54e3ce 100644 --- a/extra/libtar/PKGBUILD +++ b/extra/libtar/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151100 2012-02-24 21:37:32Z giovanni $ +# $Id: PKGBUILD 155876 2012-04-08 10:03:47Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,29 +6,36 @@ pkgname=libtar pkgver=1.2.11 -pkgrel=3 +pkgrel=4 pkgdesc="C library for manipulating POSIX tar files" arch=('i686' 'x86_64') url="http://www.feep.net/libtar/" license=('BSD') depends=('zlib') -source=("ftp://ftp.feep.net/pub/software/$pkgname/$pkgname-$pkgver.tar.gz" +source=("ftp://ftp.feep.net/pub/software/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'libtar-1.2.11-tar_header.patch' 'libtar-1.2.11.patch') -md5sums=('604238e8734ce6e25347a58c4f1a1d7e' +md5sums=('604238e8734ce6e25347a58c4f1a1d7e' + '94b03c0fdee20671e1f6d1ecaf187258' 'baef7da841c186e1830566296859c35b') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" export CFLAGS+=" -fPIC" + + # Fix FS#29322 + patch -Np1 -i "${srcdir}/libtar-1.2.11-tar_header.patch" + patch -Np1 -i "${srcdir}/libtar-1.2.11.patch" - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr \ + --mandir=/usr/share/man make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install - install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libtar/libtar-1.2.11-tar_header.patch b/extra/libtar/libtar-1.2.11-tar_header.patch new file mode 100644 index 000000000..161f7da7b --- /dev/null +++ b/extra/libtar/libtar-1.2.11-tar_header.patch @@ -0,0 +1,15 @@ +diff -Naur libtar-1.2.11/lib/encode.c libtar-1.2.11.tar_header/lib/encode.c +--- libtar-1.2.11/lib/encode.c 2003-01-07 07:10:59.000000000 +0530 ++++ libtar-1.2.11.tar_header/lib/encode.c 2009-11-20 11:13:25.166756167 +0530 +@@ -30,7 +30,10 @@ + int i, sum = 0; + + if (t->options & TAR_GNU) +- strncpy(t->th_buf.magic, "ustar ", 8); ++ { ++ memcpy(t->th_buf.magic, "ustar ", 6); ++ memcpy(t->th_buf.version, " \0", 2); ++ } + else + { + strncpy(t->th_buf.version, TVERSION, TVERSLEN); diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index 16a37efe4..60f229171 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 152026 2012-03-04 13:12:52Z tpowa $ +# $Id: PKGBUILD 155878 2012-04-08 11:00:49Z ibiru $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=12 +pkgrel=15 epoch=1 -_extramodules=extramodules-3.2-ARCH -_kernver="$(cat /lib/modules/${_extramodules}/version)" +_extramodules=extramodules-3.3-ARCH arch=('i686' 'x86_64') url="http://www.lirc.org/" license=('GPL') -makedepends=('help2man' 'linux-headers>=3.2' 'linux-headers<3.3' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +### NOTICE don't forget to bump version in depends in package_lirc +makedepends=('help2man' 'linux-headers>=3.3' 'linux-headers<3.4' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -32,6 +32,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '69d099e6deedfa3c1ee2b6e82d9b8bfb') build() { + _kernver="$(cat /lib/modules/${_extramodules}/version)" cd "${srcdir}/lirc-${pkgver}" patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" @@ -61,7 +62,7 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux>=3.2' 'linux<3.3') + depends=('lirc-utils' 'linux>=3.3' 'linux<3.4') replaces=('lirc+pctv') install=lirc.install diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install index 9bf905742..4339aaf45 100644 --- a/extra/lirc/lirc.install +++ b/extra/lirc/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.2-ARCH +EXTRAMODULES=extramodules-3.3-ARCH post_install() { # updating module dependencies diff --git a/extra/python-pysqlite/PKGBUILD b/extra/python-pysqlite/PKGBUILD index d8cdd75a8..030223319 100644 --- a/extra/python-pysqlite/PKGBUILD +++ b/extra/python-pysqlite/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 140136 2011-10-07 20:31:49Z angvp $ +# $Id: PKGBUILD 155872 2012-04-08 07:25:46Z remy $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=python-pysqlite pkgver=2.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" license=('custom') arch=('i686' 'x86_64') url="http://code.google.com/p/pysqlite/" -depends=('python2' 'sqlite3') +depends=('python2' 'sqlite') replaces=('pysqlite2') source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \ setup.cfg) diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 090d798f0..3432d31d3 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -5,7 +5,7 @@ pkgname=ruby pkgver=1.9.3_p125 -pkgrel=3 +pkgrel=4 pkgdesc='An object-oriented language for quick and easy programming' arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' diff --git a/extra/ruby/ruby.install b/extra/ruby/ruby.install index f91254084..ce78e96ec 100644 --- a/extra/ruby/ruby.install +++ b/extra/ruby/ruby.install @@ -1,11 +1,22 @@ #!/bin/sh +print_gem_default_target() { + echo 'The default location of gem installs is $HOME/.gem/ruby' + echo 'Add the following line to your PATH if you plan to install using gem' + echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin' + echo 'If you want to install to the system wide location, you must either:' + echo 'edit /etc/gemrc or run gem with the --no-user-install flag.' +} + +# arg 1: the new package version +post_install() { + print_gem_default_target +} + # arg 1: the new package version # arg 2: the old package version post_upgrade() { - if [ "$(vercmp $2 1.9.3_p125)" -lt 0 ]; then - echo 'The default location of gem installs has changed to $HOME/.gem/ruby' - echo 'If you want to install to the system wide location, you must either:' - echo 'edit /etc/gemrc or run gem with the --no-user-install flag.' + if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then + print_gem_default_target fi } diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 875f39a0e..1953c1764 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -3,10 +3,12 @@ # Arch Contributor: William Rea <sillywilly@gmail.com> # Arch maintainer: Gaetan Bisson <bisson@archlinux.org> # Parabola maintainer: Brendan Tildesley +# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy> +_pkgname=audacious-plugins pkgname=audacious-plugins-libre -pkgver=3.2 -pkgrel=1 +pkgver=3.2.2 +pkgrel=1.1 pkgdesc='Plugins for Audacious without unfree plugins' url='http://audacious-media-player.org/' arch=('i686' 'x86_64') @@ -15,12 +17,12 @@ license=('GPL' 'GPL3' 'LGPL' 'custom') # Licensing issues: # The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice # but I've been informed by an upstream dev, nenolod, that they are all GPL. I don't know what version -# +# # The plugin 'psf' is currently (Nov 2011) BSD+noncommercial, but is apparently being changed to GPL. # However, 'psf' is apparently an emulator for running non-free code, so I'm not rushing to fix it. # # All the other custom licensed plugins I think are mostly modified BSD or ISC. - + provides=("audacious-plugins=$pkgver") replaces=("${pkgname%-libre}") conflicts=("${pkgname%-libre}") @@ -57,47 +59,34 @@ optdepends=('oss: Open Sound System v4 output' 'libmms: libmms-based mms transport' 'libcue: CUE playlist format') -source=("http://repo.parabolagnulinux.org/~brendan/src-libre/${pkgname}-${pkgver}.tar.xz") -sha1sums=('6375b65b975e2905a8ff1c0ddfaeee2a71bbef94') - -# Retrieve upstream & remove plugin 'psf' due to issues mentioned above. Repackage as -libre -mksource(){ - [ -f ${pkgname%-libre}-$pkgver.tar.bz2 ] || wget http://distfiles.audacious-media-player.org/${pkgname%-libre}-$pkgver.tar.bz2 - tar xjf ${pkgname%-libre}-${pkgver}.tar.bz2 - - rm -rvf ${pkgname%-libre}-$pkgver/src/psf/ - sed -i s/enable_psf=yes/enable_psf=no/ ${pkgname%-libre}-$pkgver/configure - - mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver - tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/ - rm -rf ${pkgname}-${pkgver} - echo "${pkgname}-${pkgver}.tar.xz is your new -libre source package." - -} - +source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('4518a6fdcba0c1b496e048b45ce5d87a46326c9b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. + sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure + + cd "${srcdir}/${_pkgname}-${pkgver}" # Get license notices out of custom-licensed packages cd src - tmpdir=$(mktemp -d /tmp/${pkgname}-${pkgver}-XXXX) - head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart - head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa - head -n 17 audpl/audpl.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.audpl + tmpdir=$(mktemp -d /tmp/${_pkgname}-${pkgver}-XXXX) + head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart + head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa + head -n 17 audpl/audpl.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.audpl head -n 18 cairo-spectrum/cairo-spectrum.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.cairo-spectrum - head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor - head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade - head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer - head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki - head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123 - head -n 17 mpris2/plugin.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mpris2 - head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample - head -n 17 unix-io/unix-io.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io - head -n 18 voice_removal/voice_removal.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal - head -n 25 xsf/corlett.c | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs - l=${pkgdir}/usr/share/licenses/${pkgname}/ + head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor + head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade + head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer + head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki + head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123 + head -n 17 mpris2/plugin.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mpris2 + head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample + head -n 17 unix-io/unix-io.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io + head -n 18 voice_removal/voice_removal.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal + head -n 25 xsf/corlett.c | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs + l=${pkgdir}/usr/share/licenses/${pkgname}/ install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} - cd .. + cd .. pushd $tmpdir install -m644 LICENSE.albumart $l install -m644 LICENSE.alsa $l @@ -118,12 +107,12 @@ build() { ./configure \ --prefix=/usr \ --enable-amidiplug \ - --disable-adplug + --disable-adplug \ make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index c6e4ab588..2b3c84263 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,18 +1,19 @@ # $Id$ # Maintainer: Mateusz Herych <heniekk@gmail.com> +# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy> pkgname=libquicktime-libre _pkgname=libquicktime -pkgver=1.2.2 -pkgrel=3 +pkgver=1.2.4 +pkgrel=1 pkgdesc="A library for reading and writing quicktime files (no unfree faac support)." arch=('i686' 'x86_64') license=('GPL') url="http://libquicktime.sourceforge.net/" -depends=('gtk2' 'ffmpeg' 'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2') +depends=('gtk2' 'ffmpeg' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz) -sha256sums=('a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436') +sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368') provides=("$_pkgname=$pkgver") conflicts=($_pkgname) replaces=($_pkgname) diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD index 626a5739a..a5302e7f9 100644 --- a/testing/btrfs-progs/PKGBUILD +++ b/testing/btrfs-progs/PKGBUILD @@ -1,18 +1,23 @@ -# $Id: PKGBUILD 154467 2012-03-28 21:30:44Z tomegun $ +# $Id: PKGBUILD 155911 2012-04-09 02:05:53Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=btrfs-progs pkgver=0.19.20120328 -pkgrel=1 +pkgrel=2 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64) depends=('glibc' 'e2fsprogs') -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz) url="http://btrfs.wiki.kernel.org/" replaces=('btrfs-progs-unstable') conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') license=('GPL2') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz + initcpio-install-btrfs + initcpio-hook-btrfs) +md5sums=('f4504e73cf9254779b78d5b2318ac570' + 'bdaaf6bd339220c63260acec809864d2' + 'b09688a915a0ec8f40e2f5aacbabc9ad') build() { cd $srcdir/$pkgname-$pkgver @@ -27,5 +32,10 @@ package() { mv $pkgdir/usr/man $pkgdir/usr/share/man mkdir -p ${pkgdir}/sbin ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs + + # install mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-btrfs" \ + "$pkgdir/usr/lib/initcpio/install/btrfs" + install -Dm644 "$srcdir/initcpio-hook-btrfs" \ + "$pkgdir/usr/lib/initcpio/hooks/btrfs" } -md5sums=('f4504e73cf9254779b78d5b2318ac570') diff --git a/testing/btrfs-progs/initcpio-hook-btrfs b/testing/btrfs-progs/initcpio-hook-btrfs new file mode 100644 index 000000000..7965d0a8a --- /dev/null +++ b/testing/btrfs-progs/initcpio-hook-btrfs @@ -0,0 +1,7 @@ +#!/usr/bin/ash + +run_hook() { + btrfs device scan +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs new file mode 100644 index 000000000..dbeb47ee8 --- /dev/null +++ b/testing/btrfs-progs/initcpio-install-btrfs @@ -0,0 +1,15 @@ +#!/bin/bash + +build() { + MODULES=$(all_modules btrfs) + BINARIES=btrfs + SCRIPT=btrfs +} + +help() { + cat <<HELPEOF +This hook provides support for multi-device btrfs volumes. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD index af3f298f8..3c2d43cfe 100644 --- a/testing/gcc/PKGBUILD +++ b/testing/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154483 2012-03-29 03:43:53Z allan $ +# $Id: PKGBUILD 155913 2012-04-09 02:50:50Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,8 +6,8 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.7.0 -pkgrel=3 -_snapshot=4.7-20120324 +pkgrel=4 +_snapshot=4.7-20120407 _libstdcppmanver=20120307 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-4.7.0-cloog-0.17.patch) -md5sums=('947f9a70dcbb4baaf20b1e95b518048e' +md5sums=('e44a8484687ef52c02066d6434ecf42b' '489d2f5311535800a120efd8d18db719' 'ced48436c1b3c981d721a829f1094de1' '575f7d17b022e609447a590e481b18b5') diff --git a/testing/keyutils/PKGBUILD b/testing/keyutils/PKGBUILD new file mode 100644 index 000000000..8d532e6a4 --- /dev/null +++ b/testing/keyutils/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 155899 2012-04-08 23:31:56Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +pkgname=keyutils +pkgver=1.5.5 +pkgrel=2 +pkgdesc="Linux Key Management Utilities" +arch=(i686 x86_64) +url="http://www.kernel.org" +license=('GPL2' 'LGPL2.1') +depends=('glibc' 'sh') +backup=(etc/request-key.conf) +source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('d759680b2f23c99af95938f5026f25fb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" LIBDIR="/usr/lib" USRLIBDIR="/usr/lib" install +} diff --git a/testing/popt/PKGBUILD b/testing/popt/PKGBUILD new file mode 100644 index 000000000..171740966 --- /dev/null +++ b/testing/popt/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 155901 2012-04-08 23:40:03Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> +# Contributor: John Proctor <jproctor@prium.net> + +pkgname=popt +pkgver=1.16 +pkgrel=5 +pkgdesc="A commandline option parser" +arch=('i686' 'x86_64') +url="http://rpm5.org" +license=('custom') +depends=('glibc') +options=('!libtool') +source=(http://rpm5.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz) +sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/rfkill/60-rfkill.rules b/testing/rfkill/60-rfkill.rules new file mode 100644 index 000000000..bc98a3bef --- /dev/null +++ b/testing/rfkill/60-rfkill.rules @@ -0,0 +1 @@ +KERNEL=="rfkill", GROUP="rfkill", MODE="0664" diff --git a/testing/rfkill/PKGBUILD b/testing/rfkill/PKGBUILD new file mode 100644 index 000000000..14d0a8d1c --- /dev/null +++ b/testing/rfkill/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 155889 2012-04-08 22:34:37Z bisson $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=rfkill +pkgver=0.4 +pkgrel=4 +pkgdesc="A tool for enabling and disabling wireless devices" +arch=('i686' 'x86_64') +url="http://linuxwireless.org/en/users/Documentation/rfkill" +license=('custom') +source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + 60-rfkill.rules + rfkill.conf.d + rfkill.rc.d) +backup=(etc/conf.d/rfkill) +md5sums=('727892c0fb35c80ee3849fbe89b45350' + '63f9bf9264911242e430867a41e8918c' + '398e7cadf023e05e3e0c323aa33575b9' + '793f0510e26547eb2632efce7d16e50e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + # License + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + # Udev rule + install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules" + # Init script + install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill" + install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill" +} diff --git a/testing/rfkill/rfkill.conf.d b/testing/rfkill/rfkill.conf.d new file mode 100644 index 000000000..4483da26c --- /dev/null +++ b/testing/rfkill/rfkill.conf.d @@ -0,0 +1,20 @@ +# +# /etc/conf.d/rfkill +# Configuration for the rfkill startup script +# + +# List of devices to block on startup (space-separated) +RFKILL_BLOCK="" + +# List of devices to unblock on startup (space-separated) +RFKILL_UNBLOCK="all" + +# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ... +# See "rfkill list" for available devices +# Examples: +# +# Block all bluetooth devices: +# RFKILL_BLOCK="bluetooth" +# +# Unblock the phy0 wifi device and all wwan devices: +# RFKILL_UNBLOCK="phy0 wwan" diff --git a/testing/rfkill/rfkill.rc.d b/testing/rfkill/rfkill.rc.d new file mode 100755 index 000000000..ce90ee150 --- /dev/null +++ b/testing/rfkill/rfkill.rc.d @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/rfkill + +case "$1" in + start) + for device in ${RFKILL_BLOCK}; do + stat_busy "Blocking rfkill device: ${device}" + /usr/sbin/rfkill block ${device} + if [ $? -eq 0 ]; then + stat_done + else + stat_fail + fi + done + for device in ${RFKILL_UNBLOCK}; do + stat_busy "Unblocking rfkill device: ${device}" + /usr/sbin/rfkill unblock ${device} + if [ $? -eq 0 ]; then + stat_done + else + stat_fail + fi + done + ;; + stop) + ;; + restart) + $0 start + ;; + *) + echo "usage: $0 {start}" + exit 1 + ;; +esac +exit 0 |
