diff options
34 files changed, 412 insertions, 126 deletions
diff --git a/community/acetoneiso2/PKGBUILD b/community/acetoneiso2/PKGBUILD index 7ae5c20e2..f86f0421c 100644 --- a/community/acetoneiso2/PKGBUILD +++ b/community/acetoneiso2/PKGBUILD @@ -1,6 +1,7 @@ +# $Id: PKGBUILD 58519 2011-11-13 15:33:17Z andrea $ +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Wes Brewer <brewerw@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=acetoneiso2 pkgver=2.3 @@ -9,7 +10,7 @@ pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)" arch=('i686' 'x86_64') url="http://www.acetoneteam.org" license=('GPL3') -depends=('qt>=4' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon') +depends=('qt' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon') optdepends=("p7zip: for ISO compress/decompress support") conflicts=('acetoneiso') install=${pkgname}.install @@ -20,6 +21,7 @@ build() { cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso qmake + # needed for phonon sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile make } diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 50b2e8b2f..6a6175009 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58327 2011-11-11 14:02:33Z stativ $ +# $Id: PKGBUILD 58520 2011-11-13 15:38:01Z andrea $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD index 2af68e389..8cd682302 100644 --- a/community/goldendict/PKGBUILD +++ b/community/goldendict/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 52155 2011-07-20 20:14:39Z jlichtblau $ +# $Id: PKGBUILD 58521 2011-11-13 15:39:18Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: m0rph <m0rph.mailbox@gmail.com> @@ -9,11 +9,10 @@ pkgdesc="Feature-rich dictionary lookup program" arch=('i686' 'x86_64') url="http://goldendict.berlios.de/" license=('GPL3') -depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'openssl' 'phonon') -makedepends=('patch') +depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'phonon') provides=('stardict') changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 \ +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 $pkgname-paths.diff) sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6' '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589') @@ -33,6 +32,6 @@ package() { make INSTALL_ROOT=${pkgdir} install -#removing unneeded + #removing unneeded rm -rf ${pkgdir}/usr/share/app-install } diff --git a/community/google-gadgets/PKGBUILD b/community/google-gadgets/PKGBUILD index 5e7d6c624..c56d9f808 100644 --- a/community/google-gadgets/PKGBUILD +++ b/community/google-gadgets/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44556 2011-04-08 21:04:15Z spupykin $ +# $Id: PKGBUILD 58523 2011-11-13 15:42:30Z andrea $ # Maintainer: Ray Rashif <schiv@archlinux.org> pkgbase=google-gadgets diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD index f10780c27..fd72e1403 100644 --- a/community/gpsbabel/PKGBUILD +++ b/community/gpsbabel/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 57048 2011-10-19 10:30:50Z spupykin $ +# $Id: PKGBUILD 58522 2011-11-13 15:40:29Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gpsbabel @@ -11,7 +11,7 @@ arch=('i686' 'x86_64') url="http://www.gpsbabel.org" license=('GPL') depends=('libusb-compat' 'expat') -makedepends=('fop' 'qt' 'libxml2' 'libxslt') +makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2') optdepends=('qt') options=('docs') source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz" diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD index a7bab40dc..f09805e96 100644 --- a/community/gummi/PKGBUILD +++ b/community/gummi/PKGBUILD @@ -3,16 +3,16 @@ # Contributor: soeren <nonick@posteo.de> pkgname=gummi -pkgver=0.5.8 -pkgrel=4 +pkgver=0.6.0 +pkgrel=1 pkgdesc='Simple LaTex editor for GTK users' arch=('i686' 'x86_64') url='http://gummi.midnightcoding.org/' license=('MIT') depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib') makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool') -source=("http://dev.midnightcoding.org/redmine/attachments/download/141/gummi-0.5.8-2.tar.gz") -md5sums=('79cd1360779125ad85a0f0b459951b27') +source=("http://dev.midnightcoding.org/redmine/attachments/download/212/gummi-0.6.0.tar.gz") +md5sums=('45c727b815460e108a4442db27edd385') build() { cd ${pkgname}-${pkgver} diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index dbbb7450b..c346ce19a 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,7 +6,7 @@ pkgname=john pkgver=1.7.8 -pkgrel=6 +pkgrel=7 _jumbover=8 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)" arch=('i686' 'x86_64') @@ -65,7 +65,7 @@ package() { # install password list and charset files install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{{all,alnum,alpha,digits,lanman}.chr,password.lst} \ ${pkgdir}/usr/share/john/ - install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32}.conf \ + install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32,dynamic}.conf \ ${pkgdir}/usr/share/john/ # install binaries diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index 0c116b3cd..dabc9abfa 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57067 2011-10-20 15:00:52Z bpiotrowski $ +# $Id: PKGBUILD 58524 2011-11-13 15:44:01Z andrea $ # Maintainer: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> @@ -15,13 +15,16 @@ source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) md5sums=('6211a9a9e02d645268cbf055892601a0') build() { - cd $srcdir/kadu-$pkgver - cmake . -DCMAKE_INSTALL_PREFIX=/usr + cd $srcdir + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd $srcdir/kadu-$pkgver + cd $srcdir/build make DESTDIR=$pkgdir install rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index 47f99a313..bfcee39d5 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,6 +1,5 @@ -# $Id: PKGBUILD 53306 2011-08-02 18:26:59Z spupykin $ +# $Id: PKGBUILD 58525 2011-11-13 15:45:32Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc pkgver=4.0.4 @@ -13,12 +12,22 @@ makedepends=('cmake') license=('GPL') options=("!libtool") install=kvirc.install -source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/kvirc-$pkgver.tar.bz2) +source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2) md5sums=('26fd24979ae4a29bac9309b3b0c98788') build() { - cd $srcdir/kvirc-$pkgver - [ $NOEXTRACT -eq 1 ] || cmake -DWANT_KDE4=OFF -DWANT_PERL=ON -DWANT_PHONON=OFF -DCMAKE_INSTALL_PREFIX=/usr . + cd $srcdir + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DWANT_KDE4=OFF \ + -DWANT_PERL=ON \ + -DWANT_PHONON=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr . make +} + +package() { + cd ${srcdir}/build make DESTDIR=$pkgdir install } diff --git a/community/musescore/PKGBUILD b/community/musescore/PKGBUILD index 1298702db..8365828b8 100644 --- a/community/musescore/PKGBUILD +++ b/community/musescore/PKGBUILD @@ -1,21 +1,23 @@ -# Contributor: Cristian Maureira <saint [at] archlinux.cl> -# Previous Contributor: Dr.Egg <rwhite @ archlinux . us> +# $Id: PKGBUILD 58526 2011-11-13 15:57:02Z andrea $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de +# Contributor: Cristian Maureira <saint [at] archlinux.cl> +# Contributor: Dr.Egg <rwhite @ archlinux . us> pkgname=musescore pkgver=1.1 pkgrel=2 -pkgdesc="A music score editor written in Qt4" +pkgdesc="A music score editor written in Qt" arch=('i686' 'x86_64') url="http://www.musescore.org/en/" license=('GPL') -depends=('qt>=4.5.0' 'libsndfile' 'qtscriptgenerator') +depends=('qt' 'libsndfile' 'qtscriptgenerator') makedepends=('cmake' 'doxygen') optdepends=('portaudio' 'jack') -source=(http://sourceforge.net/projects/mscore/files/mscore/MuseScore-1.1/mscore-1.1.tar.bz2 'paths.patch') +install=musescore.install +source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2" + 'paths.patch') md5sums=('68b43af92093a16f7f074c0eb560a867' 'e5011154d217f633f21b4bb70e589510') -install=musescore.install build() { cd $srcdir/mscore-${pkgver} diff --git a/community/musescore/musescore.install b/community/musescore/musescore.install index 6d2e3727f..d6abb5470 100644 --- a/community/musescore/musescore.install +++ b/community/musescore/musescore.install @@ -3,9 +3,9 @@ post_install() { } post_upgrade() { - update-desktop-database -q + post_install } post_remove() { - update-desktop-database -q + post_install } diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 843136c80..711e82dc2 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57172 2011-10-23 02:27:54Z jconder $ +# $Id: PKGBUILD 58529 2011-11-13 16:01:47Z andrea $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.24.1 -pkgrel=3 +pkgrel=2 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ license=('GPL') depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' 'libxvmc' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' 'python-lxml' 'qt' - 'qtwebkit' 'wget') + 'wget') makedepends=('yasm') optdepends=('xmltv: to download tv listings') backup=('etc/conf.d/mythbackend') diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index 24d956ee6..e6e2fae3c 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 58527 2011-11-13 15:58:19Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Michele Mocciola <mickele> # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> @@ -5,11 +6,11 @@ pkgname=paraview pkgver=3.10.1 pkgrel=4 -pkgdesc='Parallel Visualization Application using VTK.' +pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64') url='http://www.paraview.org' license=('custom') -depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' +depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' makedepends=('cmake' 'desktop-file-utils') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" 'paraview.png' diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 70c6e2a87..a1376c92c 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58360 2011-11-12 10:52:56Z ibiru $ +# $Id: PKGBUILD 58479 2011-11-13 13:51:40Z jelle $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu pkgver=0.7.11 -pkgrel=2 +pkgrel=3 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 70cb14781..9b7280d04 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -1,50 +1,38 @@ -# $Id: PKGBUILD 57764 2011-11-02 14:37:24Z tdziedzic $ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Maintainer: Ray Rashif <schiv@archlinux.org> +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com> # Contributor: Andrzej Giniewicz <gginiu@gmail.com> -pkgbase=python-scipy -_app=scipy pkgname=('python-scipy' 'python2-scipy') -pkgver=0.9.0 -_theapp=$_app-$pkgver -pkgrel=3 +pkgver=0.10.0 +pkgrel=1 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64') url="http://www.scipy.org/" license=('BSD') -depends=('python-numpy') -makedepends=('gcc-fortran' 'python2-numpy') -source=("http://downloads.sourceforge.net/$_app/$_theapp.tar.gz") -md5sums=('ebfef6e8e82d15c875a4ee6a46d4e1cd') +makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy') +source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz") +md5sums=('e357c08425fd031dce63bc4905789088') build() { unset LDFLAGS unset FFLAGS - # Compatibility symlinks for current stable numpy - # - no need to patch numpy just for this - # see http://projects.scipy.org/numpy/ticket/1749 - ln -sf /usr/lib/liblapack.so liblapack.cpython-32mu.so - ln -sf /usr/lib/libblas.so libblas.cpython-32mu.so - export LAPACK="$srcdir" - export BLAS="$srcdir" - # Changing the arithmetic parameter (Thanks to Fabrizio Castellano) sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \ - $_theapp/$_app/special/cephes/mconf.h + scipy-${pkgver}/scipy/special/cephes/mconf.h # 2 builds - cp -r $_theapp $_theapp-py2 + cp -r scipy-${pkgver} scipy-${pkgver}-py2 # build for python3 - cd $_theapp + cd scipy-${pkgver} python setup.py config_fc --fcompiler=gnu95 build # build for python2 - cd ../$_theapp-py2 + cd ../scipy-${pkgver}-py2 for file in $(find . -name '*.py' -print); do sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file @@ -55,28 +43,29 @@ build() { } package_python-scipy() { + depends=('python-numpy') provides=('python3-scipy' 'scipy') - cd "$srcdir/$_theapp" + cd scipy-${pkgver} python setup.py config_fc --fcompiler=gnu95 install \ - --prefix=/usr --root="$pkgdir" --optimize=1 + --prefix=/usr --root=${pkgdir} --optimize=1 install -Dm644 LICENSE.txt \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + "${pkgdir}/usr/share/licenses/python-scipy/LICENSE" } package_python2-scipy() { depends=('python2-numpy') conflicts=('python-scipy<0.9.0') - cd "$srcdir/$_theapp-py2" + cd scipy-${pkgver}-py2 python2 setup.py config_fc --fcompiler=gnu95 install \ - --prefix=/usr --root="$pkgdir" --optimize=1 + --prefix=/usr --root=${pkgdir} --optimize=1 install -Dm644 LICENSE.txt \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + "${pkgdir}/usr/share/licenses/python2-scipy/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 077111f1d..d700cfceb 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -1,5 +1,6 @@ +# $Id: PKGBUILD 58528 2011-11-13 15:59:35Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=qbittorrent diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 7c9e548cb..6211e7f17 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56621 2011-10-09 07:51:45Z jlichtblau $ +# $Id: PKGBUILD 58530 2011-11-13 16:03:22Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> @@ -16,25 +16,32 @@ optdepends=('garmindev: to connect garmin devices') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-mimetypes.xml) + $pkgname-mimetypes.xml + 'fix-glu-header.patch') sha256sums=('3f87667ceffde60a7c533df7e25f375793a093970d89bfa1cd842b3595c58f2c' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0' + '8e8c6440e1674a87d5a221c978f2be832457fb43980894725044837581625618') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" - install -d ${srcdir}/$pkgname-$pkgver/build - cd ${srcdir}/$pkgname-$pkgver/build + patch -R -p2 -i "${srcdir}"/fix-glu-header.patch - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + cd "${srcdir}" + mkdir build + cd build + + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release make } package(){ - cd ${srcdir}/$pkgname-$pkgver/build + cd "${srcdir}/build" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install - install -D -m644 ${srcdir}/$pkgname-mimetypes.xml \ - ${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml + install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \ + "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml" } diff --git a/community/qlandkartegt/fix-glu-header.patch b/community/qlandkartegt/fix-glu-header.patch new file mode 100644 index 000000000..214ad395d --- /dev/null +++ b/community/qlandkartegt/fix-glu-header.patch @@ -0,0 +1,12 @@ +--- QLandkarteGT/trunk/src/CMap3D.cpp 2011/08/23 16:34:50 2943 ++++ QLandkarteGT/trunk/src/CMap3D.cpp 2011/09/03 07:58:02 2961 +@@ -31,8 +31,8 @@ + #include "CWptDB.h" + #include "WptIcons.h" + +-#include <GL/glu.h> + #include <QtGui> ++#include <QtOpenGL> + #include <math.h> + + #ifndef GL_CLAMP_TO_EDGE diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD index d28a677ca..a413dd498 100644 --- a/community/qmc2/PKGBUILD +++ b/community/qmc2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 50714 2011-06-29 20:28:47Z spupykin $ +# $Id: PKGBUILD 58531 2011-11-13 16:04:18Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com> +# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> pkgname=qmc2 pkgver=0.2.b20 pkgrel=1 -pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME." +pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.arcadehits.net" license=("GPL") arch=('i686' 'x86_64') @@ -23,6 +23,6 @@ build() { package() { cd "$srcdir/$pkgname" make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install - mkdir -p $pkgdir/usr/share/{applications,pixmaps} + install -d $pkgdir/usr/share/{applications,pixmaps} install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps" } diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index a5216ce4d..fa751f92b 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56042 2011-09-29 16:07:37Z svenstaro $ +# $Id: PKGBUILD 58532 2011-11-13 16:04:52Z andrea $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index d42a7df02..97e0898b0 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55126 2011-09-02 23:39:52Z giovanni $ +# $Id: PKGBUILD 58533 2011-11-13 16:05:39Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> @@ -18,6 +18,7 @@ md5sums=('ce27976254236f8b11b787fd05be9acb' 'fef6aa492af487ccccd6b133635cee5a') build() { + cd "${srcdir}" mkdir build cd build cmake -G "Unix Makefiles" \ @@ -31,7 +32,7 @@ build() { } package() { - cd build + cd "${srcdir}"/build make install DESTDIR="${pkgdir}" install -d -m 0755 "${pkgdir}"/usr/share/applications diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD index 362ddc191..4b3dab122 100644 --- a/community/texmaker/PKGBUILD +++ b/community/texmaker/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 58537 2011-11-13 16:08:37Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: furester <xfurester@hotmail.com> diff --git a/community/wkhtmltopdf/PKGBUILD b/community/wkhtmltopdf/PKGBUILD index bff273d88..8c61fd2c4 100644 --- a/community/wkhtmltopdf/PKGBUILD +++ b/community/wkhtmltopdf/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 19347 2010-06-22 14:11:07Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 58535 2011-11-13 16:06:48Z andrea $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=wkhtmltopdf pkgver=0.9.9 @@ -17,12 +17,14 @@ build() { cd "$srcdir/$pkgname-$pkgver" qmake wkhtmltopdf.pro - make || return 1 - make INSTALL_ROOT="$pkgdir/usr" install || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir/usr" install # Generate and install man page install -d "$pkgdir/usr/share/man/man1" ./wkhtmltopdf --manpage >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1" } - -# vim:set ts=2 sw=2 et: diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 6c37dd14b..5b5e98dbe 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140832 2011-10-20 05:41:08Z ibiru $ +# $Id: PKGBUILD 142720 2011-11-13 20:52:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.30.1 +pkgver=2.30.2 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -15,7 +15,7 @@ options=('!libtool' '!docs' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz glib2.sh glib2.csh) -sha256sums=('82fde222ea33a0faac88e9b50f5b1f7fcfc235c861a9371e8fe47ec12c1e27f9' +sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') diff --git a/core/idnkit/PKGBUILD b/core/idnkit/PKGBUILD index 3dd1e0833..2a5fd256c 100644 --- a/core/idnkit/PKGBUILD +++ b/core/idnkit/PKGBUILD @@ -1,13 +1,15 @@ +# $Id: PKGBUILD 142702 2011-11-13 10:10:08Z bisson $ # Contributor: Igor Nemilentsev <trezorg@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=idnkit pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc='Provides functionalities about Internationalized Domain Name processing' -arch=('i686' 'x86_64') url='http://www.nic.ad.jp/ja/idn/idnkit/download/' license=('custom:BSD') +arch=('i686' 'x86_64') +depends=('glibc') options=('!makeflags' '!libtool') source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz") sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048') @@ -25,8 +27,14 @@ build() { make } +check() { + cd "${srcdir}/idnkit-${pkgver}-src" + make check +} + package() { cd "${srcdir}/idnkit-${pkgver}-src" make DESTDIR="${pkgdir}" install install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm "${pkgdir}"/etc/*.sample } diff --git a/core/ifenslave/PKGBUILD b/core/ifenslave/PKGBUILD index 516eba638..a730f2f5e 100644 --- a/core/ifenslave/PKGBUILD +++ b/core/ifenslave/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 108480 2011-01-31 14:27:02Z dan $ +# $Id: PKGBUILD 142704 2011-11-13 10:10:10Z bisson $ # Maintainer: # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ifenslave pkgver=1.1.0 -pkgrel=6 -pkgdesc="Utility for bonding ethernet interfaces" +pkgrel=7 +pkgdesc='Utility for bonding ethernet interfaces' arch=('i686' 'x86_64') -url="http://www.linuxfoundation.org/en/Net:Bonding" +url='http://www.linuxfoundation.org/en/Net:Bonding' license=('GPL2') depends=('glibc') makedepends=('linux-api-headers') backup=('etc/conf.d/bonding') -source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=2bac96' - bonding.conf.d) -md5sums=('41a23dc9ac3522ac2af23396ba70bcc4' - '397fccbf574d5082c7a3c8d3793dc000') +source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=65968fbf' + 'bonding.conf.d') +sha1sums=('c657d9e6b8acb983bb8ef856f8f7f25ee6bf4f73' + '6843971c0254768868b556af33289d7d32d6208d') build() { - cd $srcdir - gcc -Wall -Wstrict-prototypes $CFLAGS $LDFLAGS ifenslave.c -o ifenslave + cd "${srcdir}" + gcc -Wall -Wstrict-prototypes ${CFLAGS} ${LDFLAGS} ifenslave.c -o ifenslave } package() { - cd $srcdir - install -Dm755 ifenslave $pkgdir/sbin/ifenslave - install -Dm644 bonding.conf.d $pkgdir/etc/conf.d/bonding + cd "${srcdir}" + install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave + install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding } diff --git a/core/run-parts/PKGBUILD b/core/run-parts/PKGBUILD index 8db863192..3ae03c979 100644 --- a/core/run-parts/PKGBUILD +++ b/core/run-parts/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 136455 2011-08-29 16:51:36Z pierre $ +# $Id: PKGBUILD 142725 2011-11-13 21:03:15Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=run-parts -pkgver=4.0.2 +pkgver=4.0.4 pkgrel=1 pkgdesc='run scripts or programs in a directory' arch=('i686' 'x86_64') url='http://packages.qa.debian.org/d/debianutils.html' license=('GPL') depends=('glibc') -source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz") -sha256sums=('c2fca92e93437ea5f0904f12847779d67b13d4b9d6ca85b8213e678a03ed76dc') +source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") +sha256sums=('9a14722c7422c6d16f30c80b74201d9c803beeef2bb4c004964d0979eaa1232f') build() { cd $srcdir/debianutils-$pkgver diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 9eacf86e7..32e1fbf3b 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142365 2011-11-08 21:23:02Z andyrtr $ +# $Id: PKGBUILD 142708 2011-11-13 11:53:41Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.7 +pkgver=3.0.8 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit') makedepends=('valgrind') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) -md5sums=('840c96c75817c0f800a47805e275db7e') +md5sums=('bce40a4e9bec343b266707eb9819132b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nawk/PKGBUILD b/extra/nawk/PKGBUILD index f930b1800..d2c2125af 100644 --- a/extra/nawk/PKGBUILD +++ b/extra/nawk/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 142698 2011-11-13 02:24:31Z dreisner $ +# $Id: PKGBUILD 142711 2011-11-13 14:58:31Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=nawk pkgver=20110810 -pkgrel=2 -pkgdesc="The one, true implementation of the AWK" +pkgrel=3 +pkgdesc="The one, true implementation of AWK" url="http://cm.bell-labs.com/who/bwk/" license=('MIT') arch=('i686' 'x86_64') options=('!makeflags') depends=('glibc') -provides=('awk') source=("http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz" 'manpage-naming.patch') md5sums=('a7062ecade93dc4cb39190e48db9a51d' diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD new file mode 100644 index 000000000..d96ccbb34 --- /dev/null +++ b/testing/syslog-ng/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 142718 2011-11-13 17:30:10Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer: Aaron Griffin <aaron@archlinux.org> + +pkgname=syslog-ng +pkgver=3.3.2 +pkgrel=1 +pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" +arch=('i686' 'x86_64') +license=('GPL2') +groups=('base') +url="http://www.balabit.com/network-security/syslog-ng/" +depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk') +makedepends=('flex' 'pkg-config') +optdepends=('logrotate: for rotating log files') +provides=('logger') +options=('!libtool') +backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \ + 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') +source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz" + syslog-ng.conf + syslog-ng.logrotate + syslog-ng.rc) +sha1sums=('a7cfc987cdd584e357e253d2794bad1159776638' + '98074e0facfc6ef036202662cc86d04b38a2c142' + 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' + 'a6ad26912b5bcbe1b47b003309945d733613b98f') + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/syslog-ng \ + --libexecdir=/usr/lib \ + --localstatedir=/var/lib/syslog-ng \ + --with-pidfile-dir=/run \ + --disable-spoof-source \ + --enable-systemd \ + --with-systemdsystemunitdir=/lib/systemd/system + + make +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" + install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" + install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng" + install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng" +} diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..8f86eac2f --- /dev/null +++ b/testing/syslog-ng/syslog-ng.conf @@ -0,0 +1,92 @@ +@version: 3.3 +# +# /etc/syslog-ng/syslog-ng.conf +# + +options { + stats_freq (0); + flush_lines (0); + time_reopen (10); + log_fifo_size (10000); + chain_hostnames (off); + use_dns (no); + use_fqdn (no); + create_dirs (no); + keep_hostname (yes); + perm(0640); + group("log"); +}; + +source src { + unix-dgram("/dev/log"); + internal(); + file("/proc/kmsg"); +}; + +destination d_authlog { file("/var/log/auth.log"); }; +destination d_syslog { file("/var/log/syslog.log"); }; +destination d_cron { file("/var/log/crond.log"); }; +destination d_daemon { file("/var/log/daemon.log"); }; +destination d_kernel { file("/var/log/kernel.log"); }; +destination d_lpr { file("/var/log/lpr.log"); }; +destination d_user { file("/var/log/user.log"); }; +destination d_uucp { file("/var/log/uucp.log"); }; +destination d_mail { file("/var/log/mail.log"); }; +destination d_news { file("/var/log/news.log"); }; +destination d_ppp { file("/var/log/ppp.log"); }; +destination d_debug { file("/var/log/debug.log"); }; +destination d_messages { file("/var/log/messages.log"); }; +destination d_errors { file("/var/log/errors.log"); }; +destination d_everything { file("/var/log/everything.log"); }; +destination d_iptables { file("/var/log/iptables.log"); }; +destination d_acpid { file("/var/log/acpid.log"); }; +destination d_console { usertty("root"); }; + +# Log everything to tty12 +destination console_all { file("/dev/tty12"); }; + +filter f_auth { facility(auth); }; +filter f_authpriv { facility(auth, authpriv); }; +filter f_syslog { program(syslog-ng); }; +filter f_cron { facility(cron); }; +filter f_daemon { facility(daemon); }; +filter f_kernel { facility(kern) and not filter(f_iptables); }; +filter f_lpr { facility(lpr); }; +filter f_mail { facility(mail); }; +filter f_news { facility(news); }; +filter f_user { facility(user); }; +filter f_uucp { facility(uucp); }; +filter f_ppp { facility(local2); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; +filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; +filter f_emergency { level(emerg); }; +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; +filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; +filter f_acpid { program("acpid"); }; + +log { source(src); filter(f_acpid); destination(d_acpid); }; +log { source(src); filter(f_authpriv); destination(d_authlog); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_cron); destination(d_cron); }; +log { source(src); filter(f_daemon); destination(d_daemon); }; +log { source(src); filter(f_kernel); destination(d_kernel); }; +log { source(src); filter(f_lpr); destination(d_lpr); }; +log { source(src); filter(f_mail); destination(d_mail); }; +log { source(src); filter(f_news); destination(d_news); }; +log { source(src); filter(f_ppp); destination(d_ppp); }; +log { source(src); filter(f_user); destination(d_user); }; +log { source(src); filter(f_uucp); destination(d_uucp); }; +#log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); filter(f_messages); destination(d_messages); }; +log { source(src); filter(f_err); destination(d_errors); }; +log { source(src); filter(f_emergency); destination(d_console); }; +log { source(src); filter(f_everything); destination(d_everything); }; +log { source(src); filter(f_iptables); destination(d_iptables); }; + +# Log everything to tty12 +#log { source(src); destination(console_all); }; diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate new file mode 100644 index 000000000..e0e6929f2 --- /dev/null +++ b/testing/syslog-ng/syslog-ng.logrotate @@ -0,0 +1,7 @@ +/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { + missingok + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true + endscript +} diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc new file mode 100755 index 000000000..516b03da3 --- /dev/null +++ b/testing/syslog-ng/syslog-ng.rc @@ -0,0 +1,66 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +checkconfig() { + if ! syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf; then + stat_fail + exit 1 + fi +} + +pidfile=/run/syslog-ng.pid +if [[ -r $pidfile ]]; then + read -r PID < "$pidfile" + if [[ $PID && ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + +case $1 in + start) + stat_busy "Starting Syslog-NG" + checkconfig + if [[ -z $PID ]] && /usr/sbin/syslog-ng; then + add_daemon syslog-ng + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping Syslog-NG" + if [[ $PID ]] && kill $PID &>/dev/null; then + rm_daemon syslog-ng + stat_done + else + stat_fail + exit 1 + fi + ;; + reload) + stat_busy "Reloading Syslog-NG configuration and re-opening log files" + if [[ -z $PID ]]; then + stat_fail + else + checkconfig + if kill -HUP $PID &>/dev/null; then + stat_done + else + stat_fail + exit 1 + fi + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart|reload}" +esac diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD new file mode 100644 index 000000000..a48cb6eff --- /dev/null +++ b/testing/valgrind/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 142728 2011-11-14 01:17:20Z allan $ +# Maintainer: Dan McGee <dan@archlinux.org> +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=valgrind +pkgver=3.7.0 +pkgrel=1 +pkgdesc="A tool to help find memory-management problems in programs" +arch=('i686' 'x86_64') +license=('GPL') +url="http://valgrind.org/" +depends=('glibc>=2.14' 'glibc<2.15' 'perl') +makedepends=('gdb') +options=('!emptydirs') +source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2) +md5sums=('a855fda56edf05614f099dca316d1775') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + if [ "${CARCH}" = "x86_64" ]; then + ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit + else + ./configure --prefix=/usr --mandir=/usr/share/man + fi + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} |