From 6768c115af3c5f0772bcf7b02f34a88a880876c0 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 12 Dec 2012 02:49:40 -0800 Subject: Wed Dec 12 02:43:53 PST 2012 --- extra/celestia/PKGBUILD | 6 ++-- extra/digikam/PKGBUILD | 4 +-- extra/edje/PKGBUILD | 8 ++--- extra/enlightenment17/PKGBUILD | 8 ++--- extra/fetchmail/PKGBUILD | 12 +++---- extra/git/PKGBUILD | 8 ++--- extra/gnuplot/PKGBUILD | 4 +-- extra/gphoto2/PKGBUILD | 8 ++--- extra/graphviz/PKGBUILD | 10 +++--- extra/grilo-plugins/PKGBUILD | 6 ++-- extra/gvfs/PKGBUILD | 4 +-- extra/hugin/PKGBUILD | 9 ++--- extra/hwloc/PKGBUILD | 8 ++--- extra/ibus/PKGBUILD | 6 ++-- extra/kdegraphics-kamera/PKGBUILD | 4 +-- extra/libgphoto2/PKGBUILD | 6 ++-- extra/libquvi/PKGBUILD | 4 +-- extra/libutempter/PKGBUILD | 26 +++++++++++++++ extra/lighttpd/PKGBUILD | 8 ++--- extra/lua/LICENSE | 30 +++++++++++++++++ extra/lua/PKGBUILD | 61 +++++++++++++++++----------------- extra/lua/liblua.so.patch | 57 ++++++++++++++++++++++++++++++++ extra/lua/lua.pc | 20 ++++++++++++ extra/lua51/PKGBUILD | 56 +++++++++++++++++++++++++++++++ extra/lua51/lua-5.1-cflags.diff | 13 ++++++++ extra/lua51/lua-arch.patch | 66 +++++++++++++++++++++++++++++++++++++ extra/nmap/PKGBUILD | 4 +-- extra/openal/PKGBUILD | 6 ++-- extra/rrdtool/PKGBUILD | 12 ++++--- extra/sane/PKGBUILD | 6 ++-- extra/vim/PKGBUILD | 67 ++++++++++++++++++++++++++------------ extra/vlc/PKGBUILD | 13 +++++--- extra/weechat/PKGBUILD | 4 +-- extra/wireshark/PKGBUILD | 18 +++++----- extra/xf86-input-joystick/PKGBUILD | 7 ++-- extra/xterm/PKGBUILD | 8 ++--- 36 files changed, 449 insertions(+), 148 deletions(-) create mode 100644 extra/libutempter/PKGBUILD create mode 100644 extra/lua/LICENSE create mode 100644 extra/lua/liblua.so.patch create mode 100644 extra/lua/lua.pc create mode 100644 extra/lua51/PKGBUILD create mode 100644 extra/lua51/lua-5.1-cflags.diff create mode 100644 extra/lua51/lua-arch.patch (limited to 'extra') diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD index 570372aaa..481743d78 100644 --- a/extra/celestia/PKGBUILD +++ b/extra/celestia/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 168599 2012-10-13 11:46:55Z andyrtr $ +# $Id: PKGBUILD 173170 2012-12-12 00:31:40Z eric $ # Maintainer: Ronald van Haren # Contributor : Damir Perisa pkgname=celestia pkgver=1.6.1 -pkgrel=3 +pkgrel=4 pkgdesc="Real-time space simulation" arch=('i686' 'x86_64') license=('GPL') url="http://www.shatters.net/celestia/" -depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg') +depends=('gtk2' 'libtheora' 'lua51' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg' 'mesa') options=('!makeflags') source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz" 'celestia-1.6.1-gcc46.patch' diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index d75d064e7..3eb3d26de 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172158 2012-11-30 10:06:04Z ronald $ +# $Id: PKGBUILD 173132 2012-12-11 14:42:23Z jgc $ # Maintainer: Ronald van Haren # Contributor: Andrea Scarpino # Contributor: Tobias Powalowski @@ -6,7 +6,7 @@ pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') pkgver=2.9.0 -pkgrel=2 +pkgrel=3 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD index 83c8e6621..47c5131e7 100644 --- a/extra/edje/PKGBUILD +++ b/extra/edje/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 172968 2012-12-07 19:27:48Z ronald $ +# $Id: PKGBUILD 173171 2012-12-12 00:31:43Z eric $ # Maintainer: Ronald van Haren # Contributor: Gustavo Sverzut Barbieri pkgname=edje pkgver=1.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64') url="http://www.enlightenment.org" license=('BSD') -depends=('eina' 'ecore' 'evas' 'eio' 'lua' 'shared-mime-info' 'embryo') +depends=('eina' 'ecore' 'evas' 'eio' 'lua51' 'shared-mime-info' 'embryo') optdepends=('python2: inkscape2edc') install=edje.install options=('!libtool' '!emptydirs') @@ -29,8 +29,6 @@ build() { ./configure \ --prefix=/usr \ --disable-static \ - --enable-ecore-imf \ - --enable-eio \ --disable-sndfile \ --disable-remix \ --disable-vorbisenc \ diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index b7c097abd..a05712e28 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172937 2012-12-07 14:57:50Z ronald $ +# $Id: PKGBUILD 173152 2012-12-11 17:28:51Z ronald $ # Maintainer: Ronald van Haren # Contributor: Gustavo Sverzut Barbieri pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.0beta1 -_pkgver=0.17.0-beta +pkgver=0.17.0gamma1 +_pkgver=0.17.0-gamma pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') -sha1sums=('2ff60e4dfe050b27d597836dfb524dd205d595d9' +sha1sums=('365672de47b6db371af9eff45f7758a7c52c9280' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' '86f1c5e36dc274c3101362532378be034e89c593') diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index bf5cec137..a19e91469 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 166406 2012-09-07 16:52:15Z pierre $ +# $Id: PKGBUILD 173148 2012-12-11 16:53:09Z pierre $ pkgname=fetchmail -pkgver=6.3.22 +pkgver=6.3.23 pkgrel=1 pkgdesc="A remote-mail retrieval utility" arch=('i686' 'x86_64') @@ -14,11 +14,11 @@ optdepends=('tk: for using fetchmailconf' backup=('etc/conf.d/fetchmail') options=('!makeflags') install='fetchmail.install' -source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz" - "http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz.asc" +source=("http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz" + "http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz.asc" 'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service') -sha1sums=('3bb755010dbe568d53840e22d8e87d8d5db25b19' - '27184b75ef09c5202bede9863ae8abc3d0cdb1d2' +sha1sums=('ac3a4a16dff60fe2651fdcf3d146c91399af2a27' + 'ec1268dad146d55b45dd3fb043613a7af77b890d' 'fc25180f1add26df0a3bdaac03fd9d2e3473ff88' '30401729386d6f774c6c36ab8530842166de54a8' '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index c32a6d532..0c3602c17 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172027 2012-11-26 16:17:46Z dan $ +# $Id: PKGBUILD 173146 2012-12-11 15:31:20Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.8.0.1 +pkgver=1.8.0.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -109,8 +109,8 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('3d598a31bd8ff04f6a72c65a4cd015a8' - '0354726bd084cace4318142b53ce5aa2' +md5sums=('1aca109d4a719fe5bc43d25927fbc7d9' + 'ab83283a5b3c73ab711a9f02896ca12e' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index 80183ab73..6d3b84158 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168770 2012-10-15 19:50:22Z ronald $ +# $Id: PKGBUILD 173172 2012-12-12 00:31:46Z eric $ # Maintainer: Ronald van Haren # Contributor: damir # Contributor: Tom Newsom pkgname=gnuplot pkgver=4.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64') url="http://www.gnuplot.info" diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD index cdde57bde..4f5db3a9c 100644 --- a/extra/gphoto2/PKGBUILD +++ b/extra/gphoto2/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 156272 2012-04-16 14:41:22Z jgc $ +# $Id: PKGBUILD 173131 2012-12-11 14:42:20Z jgc $ # Maintainer: Jan de Groot # Contributor: Eduardo Romero # Contributor: Jason Chu pkgname=gphoto2 -pkgver=2.4.14 +pkgver=2.5.0 pkgrel=1 pkgdesc="A digital camera download and access program." arch=(i686 x86_64) url="http://www.gphoto.org" license=('GPL' 'LGPL') -depends=('libgphoto2>=2.4.14' 'popt' 'readline') +depends=('libgphoto2' 'popt' 'readline') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('60fd6e44d89592f6172227be67227636') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,3 +22,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } +md5sums=('64c6d291c5bd50388af0c51da71efb59') diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 066b71862..b4f6cbf32 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 160483 2012-06-02 10:26:16Z bluewind $ +# $Id: PKGBUILD 173173 2012-12-12 00:31:48Z eric $ # Maintainer: Gaetan Bisson # Contributor: kevin # Contributor: John Proctor pkgname=graphviz pkgver=2.28.0 -pkgrel=10 +pkgrel=11 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') arch=('i686' 'x86_64') depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') -makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt') +makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt') optdepends=('mono: sharp bindings' 'guile: guile bindings' - 'lua: lua bindings' + 'lua51: lua bindings' 'ocaml: ocaml bindings' 'perl: perl bindings' 'php: php bindings' @@ -41,8 +41,10 @@ build() { sed '/LIBPOSTFIX="64"/d' -i configure export PYTHON=python2 + export LUA=lua5.1 ./configure --prefix=/usr + make || sed '/caml_array_length/d' -i tclpkg/gv/gv_ocaml.cpp # swig goes wonky make } diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 1c7d392d8..ce6128bf3 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172923 2012-12-06 20:31:50Z heftig $ +# $Id: PKGBUILD 173150 2012-12-11 17:04:18Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=grilo-plugins -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" @@ -23,7 +23,7 @@ optdepends=('gupnp-av: uPnP plugin' 'json-glib: TMDb plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7e96aee95abc22897db4c62738b65f31fab66a26a22a628f2dfe682384c09350') +sha256sums=('32ae6c8ebf624e5662f209435d8aae6a5db23d7c52d446c9b9479c0b441a3ab3') build() { cd $pkgname-$pkgver diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index c77a80833..e1f87de77 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170856 2012-11-12 20:04:56Z heftig $ +# $Id: PKGBUILD 173130 2012-12-11 14:42:18Z jgc $ # Maintainer: Jan de Groot pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.14.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 3c34d8e9a..9262d49d7 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172786 2012-12-06 00:11:28Z bisson $ +# $Id: PKGBUILD 173184 2012-12-12 00:37:13Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Tobias Kieslich # Contributor: Giovanni Scafora @@ -6,14 +6,14 @@ pkgname=hugin pkgver=2012.0.0 -pkgrel=1 +pkgrel=2 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64') depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' 'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils') -makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python' 'swig') +makedepends=('cmake' 'boost' 'tclap' 'mesa') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") sha1sums=('53f97d030716e66dc5a49c7e786686a9d5262b8d') @@ -26,7 +26,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ - -DENABLE_LAPACK=yes + -DENABLE_LAPACK=yes \ + -DBUILD_HSI=no make } diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index c59e2a8b5..0f57e1f55 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170363 2012-11-06 14:16:10Z stephane $ +# $Id: PKGBUILD 173120 2012-12-11 12:57:48Z stephane $ # Maintainer : Stéphane Gaudreault # Contributor: Sylvain HENRY # Contributor: Hervé YVIQUEL pkgname=hwloc -pkgver=1.5.1 +pkgver=1.6 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ license=('BSD') depends=('sh' 'pciutils' 'cairo' 'libxml2') makedepends=('pkg-config') options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('5ce00444d7ffc261ff7877ce685a920fb38a771a') +source=(http://www.open-mpi.org/software/hwloc/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('a9c0bbcd49350b6cbe45efdc75e5962863239ebb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 09f560671..a81a1a3a1 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172983 2012-12-08 02:06:48Z eric $ +# $Id: PKGBUILD 173164 2012-12-11 22:33:51Z eric $ # Contributor: Rainy # Contributor: Lee.MaRS # Contributor: Daniel J Griffiths # Maintainer: Brad Fanella pkgname=ibus -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool') options=('!libtool') install=ibus.install source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('ca810499ca21ab85e4faa8a103cfd461361b723a') +sha1sums=('31d732c17d0a103565fa29995c5610e8be8b2dca') build() { cd ${pkgname}-${pkgver} diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index 80f315419..723b88821 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172855 2012-12-06 08:21:55Z andrea $ +# $Id: PKGBUILD 173129 2012-12-11 14:42:15Z jgc $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kamera pkgver=4.9.4 -pkgrel=1 +pkgrel=2 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" arch=('i686' 'x86_64') diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD index 24d833c67..eaf184a4a 100644 --- a/extra/libgphoto2/PKGBUILD +++ b/extra/libgphoto2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 156270 2012-04-16 14:30:06Z jgc $ +# $Id: PKGBUILD 173128 2012-12-11 14:42:12Z jgc $ # Maintainer: Jan de Groot # Contributor: Tom Gundersen # Contributor: Eduardo Romero # Contributor: Damir Perisa pkgname=libgphoto2 -pkgver=2.4.14 +pkgver=2.5.0 pkgrel=1 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." arch=(i686 x86_64) @@ -15,7 +15,7 @@ depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb') install=libgphoto2.install options=('libtool') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz) -md5sums=('492bec63dd610906c3a28030be77e650') +md5sums=('ea9b3b07a3738c0a77958d6fe13ae524') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD index 3cac977bb..b50034812 100644 --- a/extra/libquvi/PKGBUILD +++ b/extra/libquvi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167326 2012-10-01 10:01:23Z heftig $ +# $Id: PKGBUILD 173175 2012-12-12 00:31:54Z eric $ # Maintainer: Lukas Fleischer pkgname=libquvi pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc='Library for parsing video download links.' arch=('i686' 'x86_64') url='http://quvi.sourceforge.net/' diff --git a/extra/libutempter/PKGBUILD b/extra/libutempter/PKGBUILD new file mode 100644 index 000000000..8d5145a0a --- /dev/null +++ b/extra/libutempter/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: $ +# Maintainer: Jan de Groot + +pkgname=libutempter +pkgver=1.1.6 +pkgrel=1 +pkgdesc="Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files" +arch=('i686' 'x86_64') +url="ftp://ftp.altlinux.org/pub/people/ldv/utempter" +license=('LGPL') +depends=('glibc') +source=(ftp://ftp.altlinux.org/pub/people/ldv/utempter/$pkgname-$pkgver.tar.bz2) +md5sums=('b43827806923903aba2bc7cd3a2d45b7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + RPM_OPT_FLAGS="$CFLAGS" make + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + chown root:utmp "$pkgdir/usr/lib/utempter/utempter" + chmod 2755 "$pkgdir/usr/lib/utempter/utempter" +} diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index 0dddecee1..22395da3c 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 171703 2012-11-21 16:00:29Z pierre $ +# $Id: PKGBUILD 173176 2012-12-12 00:31:57Z eric $ # Maintainer: Pierre Schmitz pkgname=lighttpd pkgver=1.4.32 -pkgrel=1 +pkgrel=2 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') url="http://www.lighttpd.net/" depends=('pcre' 'bzip2' 'libldap' 'util-linux') -makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig') +makedepends=('fcgi' 'libmysqlclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig') optdepends=('libxml2: mod_webdav' - 'lua: mod_cml/mod_magnet' + 'lua51: mod_cml/mod_magnet' 'libmysqlclient: mod_mysql_vhost' 'sqlite: mod_webdav') backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd') diff --git a/extra/lua/LICENSE b/extra/lua/LICENSE new file mode 100644 index 000000000..3ef29409a --- /dev/null +++ b/extra/lua/LICENSE @@ -0,0 +1,30 @@ +License + +Lua is free software distributed under the terms of the MIT license +reproduced below; it may be used for any purpose, including commercial +purposes, at absolutely no cost without having to ask us. The only +requirement is that if you do use Lua, then you should give us credit +by including the appropriate copyright notice somewhere in your +product or its documentation. + + Copyright © 1994–2012 Lua.org, PUC-Rio. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD index 9ed38d8a2..a2759612f 100644 --- a/extra/lua/PKGBUILD +++ b/extra/lua/PKGBUILD @@ -1,42 +1,45 @@ -# $Id: PKGBUILD 156332 2012-04-17 10:35:09Z bluewind $ -# Maintainer: Juergen Hoetzel +# $Id: PKGBUILD 173169 2012-12-12 00:31:37Z eric $ +# Maintainer: Sébastien Luttringer +# Contributor: Juergen Hoetzel # Contributor: Damir Perisa -pkgname=lua -pkgver=5.1.5 -pkgrel=2 -pkgdesc="A powerful light-weight programming language designed for extending applications" +pkgname=lua +pkgver=5.2.1 +pkgrel=3 +pkgdesc='A powerful light-weight programming language designed for extending applications' arch=('i686' 'x86_64') -url="http://www.lua.org/" +url='http://www.lua.org/' depends=('readline') license=('MIT') options=('!makeflags' '!emptydirs') -source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz - lua-arch.patch lua-5.1-cflags.diff) -md5sums=('2e115fe26e435e33b0d5c022e4490567' - 'fa25feb70ef9fec975b1c20da5098b3c' - '249582bf1fd861ccf492d2c35a9fe732') +source=("http://www.lua.org/ftp/$pkgname-$pkgver.tar.gz" + 'liblua.so.patch' 'lua.pc' 'LICENSE') +md5sums=('ae08f641b45d737d12d30291a5e5f6e3' + 'bdc663c7b82ffc0b5df67611621fb625' + 'e7ba6c2b695b0b84a5ea0cbff5fc9067' + '0e2bd67b909b9ff673da844ca3480df2') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/lua-arch.patch" - patch -p1 -i "${srcdir}/lua-5.1-cflags.diff" - export CFLAGS="$CFLAGS -fPIC" - - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \ - INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ - linux +build() { + cd $pkgname-$pkgver + patch -p1 -i "$srcdir/liblua.so.patch" + [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC" + make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux + sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.$pkgver" \ - INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ + cd $pkgname-$pkgver + make \ + TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.$pkgver" \ + INSTALL_DATA="cp -d" \ + INSTALL_TOP="$pkgdir/usr" \ + INSTALL_MAN="$pkgdir/usr/share/man/man1" \ install - install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc" - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT" - + install -Dm644 lua.pc "$pkgdir/usr/lib/pkgconfig/lua.pc" # Install the documentation - install -d "${pkgdir}/usr/share/doc/lua" - install -m644 doc/*.{gif,png,css,html} "${pkgdir}/usr/share/doc/lua" + install -d "$pkgdir/usr/share/doc/lua" + install -m644 doc/*.{gif,png,css,html} "$pkgdir/usr/share/doc/lua" + install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } + +# vim:set ts=4 sw=4 et: diff --git a/extra/lua/liblua.so.patch b/extra/lua/liblua.so.patch new file mode 100644 index 000000000..92c1f3ac4 --- /dev/null +++ b/extra/lua/liblua.so.patch @@ -0,0 +1,57 @@ +diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile +--- lua-5.2.1/Makefile 2012-05-17 16:05:54.000000000 +0200 ++++ lua-5.2.1.new/Makefile 2012-09-12 22:39:07.162748096 +0200 +@@ -52,7 +52,7 @@ + all: $(PLAT) + + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua -v +diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.new/src/luaconf.h +--- lua-5.2.1/src/luaconf.h 2012-05-11 16:14:42.000000000 +0200 ++++ lua-5.2.1.new/src/luaconf.h 2012-09-12 22:40:27.986622772 +0200 +@@ -100,7 +100,7 @@ + #else /* }{ */ + + #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR + #define LUA_PATH_DEFAULT \ +diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile +--- lua-5.2.1/src/Makefile 2012-03-09 17:32:16.000000000 +0100 ++++ lua-5.2.1.new/src/Makefile 2012-09-12 22:38:08.591386896 +0200 +@@ -29,6 +29,7 @@ + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -43,7 +44,7 @@ + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -59,6 +60,12 @@ + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + diff --git a/extra/lua/lua.pc b/extra/lua/lua.pc new file mode 100644 index 000000000..bf7977bcd --- /dev/null +++ b/extra/lua/lua.pc @@ -0,0 +1,20 @@ +V=%VER% +R=%REL% + +prefix=/usr +INSTALL_BIN=${prefix}/bin +INSTALL_INC=${prefix}/include +INSTALL_LIB=${prefix}/lib +INSTALL_MAN=${prefix}/man/man1 +INSTALL_LMOD=${prefix}/share/lua/${V} +INSTALL_CMOD=${prefix}/lib/lua/${V} +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Lua +Description: An Extensible Extension Language +Version: ${R} +Requires: +Libs: -L${libdir} -llua -lm +Cflags: -I${includedir} diff --git a/extra/lua51/PKGBUILD b/extra/lua51/PKGBUILD new file mode 100644 index 000000000..1ba21ab1b --- /dev/null +++ b/extra/lua51/PKGBUILD @@ -0,0 +1,56 @@ +# $Id $ +# Maintainer: Sébastien Luttringer +# Contributor: Juergen Hoetzel +# Contributor: Damir Perisa + +pkgname=lua51 +pkgver=5.1.5 +pkgrel=3 +pkgdesc='A powerful light-weight programming language designed for extending applications' +arch=('i686' 'x86_64') +url='http://www.lua.org/' +depends=('readline') +license=('MIT') +options=('!makeflags' '!emptydirs') +source=("http://www.lua.org/ftp/lua-$pkgver.tar.gz" + 'lua-arch.patch' + 'lua-5.1-cflags.diff') +md5sums=('2e115fe26e435e33b0d5c022e4490567' + 'fa25feb70ef9fec975b1c20da5098b3c' + '249582bf1fd861ccf492d2c35a9fe732') + +build() { + cd lua-$pkgver + patch -p1 -i "$srcdir/lua-arch.patch" + patch -p1 -i "$srcdir/lua-5.1-cflags.diff" + [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC" + sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc + sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' -i src/Makefile + make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux +} + +package() { + cd lua-$pkgver + make \ + TO_BIN="lua5.1 luac5.1" \ + TO_LIB="liblua5.1.a liblua5.1.so liblua5.1.so.5.1 liblua5.1.so.$pkgver" \ + INSTALL_DATA='cp -d' \ + INSTALL_TOP="$pkgdir/usr" \ + INSTALL_INC="$pkgdir/usr/include/lua5.1" \ + INSTALL_MAN="$pkgdir/usr/share/man/man1" \ + install + install -D -m644 etc/lua.pc "$pkgdir/usr/lib/pkgconfig/lua5.1.pc" + # Install the documentation + install -d "$pkgdir/usr/share/doc/$pkgname" + install -m644 doc/*.{gif,png,css,html} "$pkgdir/usr/share/doc/$pkgname" + # Install copyrigth file + install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" + # fixups + ln -s liblua5.1.so "$pkgdir/usr/lib/liblua.so.5.1" + ln -s liblua5.1.so "$pkgdir/usr/lib/liblua.so.$pkgver" + cd "$pkgdir/usr/share/man/man1" + mv lua.1 lua5.1.1 + mv luac.1 luac5.1.1 +} + +# vim:set ts=4 sw=4 et: diff --git a/extra/lua51/lua-5.1-cflags.diff b/extra/lua51/lua-5.1-cflags.diff new file mode 100644 index 000000000..db658aeca --- /dev/null +++ b/extra/lua51/lua-5.1-cflags.diff @@ -0,0 +1,13 @@ +diff -Naur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile +--- lua-5.1.orig/src/Makefile 2006-02-16 16:45:09.000000000 +0100 ++++ lua-5.1/src/Makefile 2006-03-01 14:55:29.000000000 +0100 +@@ -8,7 +8,8 @@ + PLAT= none + + CC= gcc +-CFLAGS= -O2 -Wall $(MYCFLAGS) ++CFLAGS ?= -O2 -Wall ++CFLAGS += $(MYCFLAGS) + AR= ar rcu + RANLIB= ranlib + RM= rm -f diff --git a/extra/lua51/lua-arch.patch b/extra/lua51/lua-arch.patch new file mode 100644 index 000000000..d8650c3a2 --- /dev/null +++ b/extra/lua51/lua-arch.patch @@ -0,0 +1,66 @@ +diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc +--- lua-5.1.4/etc/lua.pc 2008-08-08 14:46:11.000000000 +0200 ++++ lua-5.1.4-new/etc/lua.pc 2012-02-23 18:25:34.000000000 +0100 +@@ -8,6 +8,6 @@ + + # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' +-prefix= /usr/local ++prefix= /usr + INSTALL_BIN= ${prefix}/bin + INSTALL_INC= ${prefix}/include + INSTALL_LIB= ${prefix}/lib +diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h +--- lua-5.1.4/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100 ++++ lua-5.1.4-new/src/luaconf.h 2012-02-23 18:25:34.000000000 +0100 +@@ -94,7 +94,7 @@ + ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" + + #else +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/5.1/" + #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" + #define LUA_PATH_DEFAULT \ +diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile +--- lua-5.1.4/src/Makefile 2008-01-19 20:37:58.000000000 +0100 ++++ lua-5.1.4-new/src/Makefile 2012-02-23 18:26:43.000000000 +0100 +@@ -23,6 +23,7 @@ + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ + lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ + lundump.o lvm.o lzio.o +@@ -36,7 +37,7 @@ + LUAC_O= luac.o print.o + + ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) + ALL_A= $(LUA_A) + + default: $(PLAT) +@@ -51,6 +52,11 @@ + $(AR) $@ $? + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + +--- lua-5.1.4/Makefile 2008-08-12 02:40:48.000000000 +0200 ++++ lua-5.1.4-new/Makefile 2012-02-23 19:06:32.000000000 +0100 +@@ -53,7 +53,7 @@ + all: $(PLAT) + + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua test/hello.lua diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index e8a07b55a..2b01b4bef 100644 --- a/extra/nmap/PKGBUILD +++ b/extra/nmap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172141 2012-11-30 02:54:16Z bisson $ +# $Id: PKGBUILD 173177 2012-12-12 00:31:59Z eric $ # Maintainer: Gaetan Bisson # Contributor: Angel Velasquez # Contributor: Hugo Doria pkgname=nmap pkgver=6.25 -pkgrel=1 +pkgrel=2 pkgdesc='Utility for network discovery and security auditing' url='http://nmap.org/' arch=('i686' 'x86_64') diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD index ed0ae8855..d28832290 100644 --- a/extra/openal/PKGBUILD +++ b/extra/openal/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173007 2012-12-08 13:24:36Z heftig $ +# $Id: PKGBUILD 173158 2012-12-11 21:59:43Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Jason Chu pkgname=openal -pkgver=1.15 +pkgver=1.15.1 pkgrel=1 pkgdesc="A cross-platform 3D audio library" arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=(glibc) makedepends=(alsa-lib sdl pkgconfig cmake libpulse) options=('!libtool') source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2) -md5sums=('0eeb0551420b8fec300fe5db6d9a7902') +md5sums=('ea83dec3b9655a27d28e7bc7cae9cd71') build() { cd $pkgname-soft-$pkgver/build diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index ae45fdf62..1594310ab 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 160575 2012-06-02 10:28:55Z bluewind $ +# $Id: PKGBUILD 173178 2012-12-12 00:32:02Z eric $ # Maintainer: Eric Bélanger pkgname=rrdtool pkgver=1.4.7 -pkgrel=2 +pkgrel=3 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" license=('GPL' 'custom') depends=('libxml2' 'pango' 'ttf-dejavu') -makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua') +makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua51') optdepends=('tcl: to use corresponding binding' \ 'python2: to use corresponding binding' \ 'ruby: to use corresponding binding' \ - 'lua: to use corresponding binding') + 'lua51: to use corresponding binding') options=('!libtool' '!emptydirs' '!makeflags') source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b') @@ -24,7 +24,9 @@ build() { # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in - PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ + PYTHON=python2 LUA=/usr/bin/lua5.1 \ + LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \ + ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ --enable-ruby --enable-ruby-site-install --enable-python \ --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 8d7c425ac..4abdfd248 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165659 2012-08-28 10:12:18Z tpowa $ +# $Id: PKGBUILD 173127 2012-12-11 14:42:10Z jgc $ # Maintainer: Tobias Powalowski # Contributor: Sarah Hay # Contributor: Simo L. @@ -6,12 +6,12 @@ pkgname=sane pkgver=1.0.23 -pkgrel=1 +pkgrel=2 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') license=('GPL') -depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') +depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') makedepends=('texlive-latexextra') install=$pkgname.install backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 1a5e41a37..8b44815b3 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 169591 2012-10-24 01:48:33Z tdziedzic $ +# Maintainer: Thomas Dziedzic # Contributor: Jan "heftig" Steffens -# Maintainer: tobias [ tobias at archlinux org ] -# Maintainer: Daniel J Griffiths +# Contributor: tobias [ tobias at archlinux org ] +# Contributor: Daniel J Griffiths pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=712 -__hgrev=57e8b75298d6 +_patchlevel=754 +__hgrev=52bfa939fc07 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('368435a6494a2559565ce4d668c4513c' - '1613bbbd2a794cd321db09c6cfe2d35f' +md5sums=('187bec934962a7b5418dbe233e606eef' + '3a41d935a372c712088cdee997e1287f' '6e7adfbd5d26c1d161030ec203a7f243' '20fceda56badf201695c57999b0bc609' '10353a61aadc3f276692d0e17db1478e' @@ -30,7 +30,6 @@ md5sums=('368435a6494a2559565ce4d668c4513c' # source PKGBUILD && mksource mksource() { - [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1) __hgroot='http://vim.googlecode.com/hg/' @@ -51,7 +50,11 @@ mksource() { rm ${pkgname}-${pkgver}/{.hgignore,.hgtags} tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* rm -r ${pkgname}-${pkgver} - #gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz + + gpg --detach-sign ${pkgname}-${pkgver}.tar.xz + + scp ${pkgname}-${pkgver}.tar.xz ger:/srv/ftp/other/vim/ + scp ${pkgname}-${pkgver}.tar.xz.sig ger:/srv/ftp/other/vim/ } build() { @@ -71,23 +74,45 @@ build() { cd "${srcdir}"/vim-build - ./configure --prefix=/usr --localstatedir=/var/lib/vim \ - --with-features=big --with-compiledby=ArchLinux \ - --enable-gpm --enable-acl --with-x=no \ - --disable-gui --enable-multibyte --enable-cscope \ - --disable-netbeans --enable-perlinterp --disable-pythoninterp \ - --disable-python3interp --disable-rubyinterp --disable-luainterp + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=big \ + --with-compiledby=ArchLinux \ + --enable-gpm \ + --enable-acl \ + --with-x=no \ + --disable-gui \ + --enable-multibyte \ + --enable-cscope \ + --disable-netbeans \ + --enable-perlinterp \ + --disable-pythoninterp \ + --disable-python3interp \ + --disable-rubyinterp \ + --disable-luainterp make cd "${srcdir}"/gvim-build - ./configure --prefix=/usr --localstatedir=/var/lib/vim \ - --with-features=big --with-compiledby=ArchLinux \ - --enable-gpm --enable-acl --with-x=yes \ - --enable-gui=gtk2 --enable-multibyte --enable-cscope \ - --enable-netbeans --enable-perlinterp --enable-pythoninterp \ - --disable-python3interp --enable-rubyinterp --enable-luainterp + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=big \ + --with-compiledby=ArchLinux \ + --enable-gpm \ + --enable-acl \ + --with-x=yes \ + --enable-gui=gtk2 \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp \ + --enable-pythoninterp \ + --disable-python3interp \ + --enable-rubyinterp \ + --enable-luainterp make } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 6ac86d93f..f36312613 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 171268 2012-11-16 23:35:53Z ibiru $ +# $Id: PKGBUILD 173179 2012-12-12 00:32:08Z eric $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=2.0.4 -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' - 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' + 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' 'xcb-util-keysyms') @@ -19,7 +19,8 @@ makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd' 'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss' - 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2') + 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' + 'mesa') optdepends=('avahi: for service discovery using bonjour protocol' 'libnotify: for notification plugin' 'ncurses: for ncurses interface support' @@ -82,7 +83,9 @@ build() { --enable-vcdx \ --enable-upnp \ --enable-opus \ - --enable-sftp + --enable-sftp \ + LUAC=luac5.1 + make } diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index 5eb90d740..7de13e63e 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171536 2012-11-18 15:48:02Z giovanni $ +# $Id: PKGBUILD 173180 2012-12-12 00:32:10Z eric $ # Maintainer: Giovanni Scafora # Contributor: lucke pkgname=weechat pkgver=0.3.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64') url="http://www.weechat.org/" diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 65750aabc..ba5dec5b7 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 168916 2012-10-16 14:27:05Z guillaume $ +# $Id: PKGBUILD 173181 2012-12-12 00:32:12Z eric $ # Maintainer: Guillaume ALAUX # Contributor: Florian Pritz pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.8.3 +pkgver=1.8.4 pkgrel=2 arch=('i686' 'x86_64') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' - 'libgcrypt' 'lua' 'python' 'portaudio') -url="http://www.wireshark.org/" + 'libgcrypt' 'lua51' 'python' 'portaudio') +url='http://www.wireshark.org/' options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 enable_version.patch) -sha1sums=('3e1322eea5794c71de752b7923af9379bcc95299' - '9a56a9153b6903e508b0375cde4f6e57ffc544e6') +sha256sums=('cae9ec0cb9fa0b732a76c0f72f8c15d763f8cdc2e389cda2da6c48c24559faac' + '0cf13fb0a53909dd737e44f3c3f62b824527d7c96eaffb69d9a8bf4772d54cbd') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -32,8 +32,8 @@ build() { } package_wireshark-cli() { - pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version" - depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua' 'portaudio') + pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' + depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'portaudio' 'lua51') install=wireshark.install conflicts=(wireshark) @@ -56,7 +56,7 @@ package_wireshark-cli() { } package_wireshark-gtk() { - pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - GTK frontend" + pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend' depends=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') install=wireshark-gtk.install replaces=(wireshark) diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD index ae655949c..2b1544b9f 100644 --- a/extra/xf86-input-joystick/PKGBUILD +++ b/extra/xf86-input-joystick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168557 2012-10-13 11:43:35Z andyrtr $ +# $Id: PKGBUILD 173112 2012-12-11 10:08:00Z jgc $ # Maintainer: Jan de Groot pkgname=xf86-input-joystick pkgver=1.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -11,17 +11,16 @@ license=('custom') depends=('glibc') makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +backup=('etc/X11/xorg.conf.d/50-joystick.conf') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - #git-fixes.patch 50-joystick.conf) sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580' 'e1ff3699a0470c6bb78a53f718df9d8521621e11') build() { cd "${srcdir}/${pkgname}-${pkgver}" - #patch -Np1 -i "${srcdir}/git-fixes.patch" ./configure --prefix=/usr make } diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 998538cf1..5ba380c91 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 172019 2012-11-26 14:56:12Z andyrtr $ +# $Id: PKGBUILD 173116 2012-12-11 10:32:56Z jgc $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xterm pkgver=287 -pkgrel=1 +pkgrel=2 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') url="http://invisible-island.net/xterm/" license=('custom') -depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps') +depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) md5sums=('0e4385e66d40b5dd6017d02c3db2a4af' @@ -43,7 +43,7 @@ build() { --enable-narrowproto \ --enable-exec-xterm \ --with-tty-group=tty \ - --with-utmp-setgid=utmp + --with-utempter make } -- cgit v1.2.3-54-g00ecf