From d5effc9aadfb9ed5890376ca9497eef52fafcf83 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Sep 2011 23:14:41 +0000 Subject: Wed Sep 14 23:14:41 UTC 2011 --- community/calibre/PKGBUILD | 4 +- community/cuneiform/PKGBUILD | 20 +++++--- community/gnucap/PKGBUILD | 15 ++++-- community/libmemcached/PKGBUILD | 8 +-- community/mashup/PKGBUILD | 6 +-- community/mms_client/PKGBUILD | 5 +- community/mongodb/PKGBUILD | 20 +++----- community/mongodb/mongodb.rc | 4 +- community/notion/PKGBUILD | 109 +++++++++++++++++----------------------- community/ogle-gui/PKGBUILD | 21 +++++--- community/performous/PKGBUILD | 4 +- community/qbittorrent/PKGBUILD | 4 +- community/rss-glx/PKGBUILD | 8 ++- community/vtk/PKGBUILD | 21 +++----- 14 files changed, 119 insertions(+), 130 deletions(-) (limited to 'community') diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index a640f65f0..33b5cc2a5 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55335 2011-09-10 01:42:32Z giovanni $ +# $Id: PKGBUILD 55511 2011-09-13 21:33:02Z ebelanger $ # Maintainer: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre pkgver=0.8.18 -pkgrel=1 +pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD index 93e8496ed..2c5f9afb0 100644 --- a/community/cuneiform/PKGBUILD +++ b/community/cuneiform/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 45314 2011-04-19 21:30:46Z spupykin $ +# $Id: PKGBUILD 55513 2011-09-13 21:33:06Z ebelanger $ # Maintainer: Sergej Pupykin # Contributor: Maxim Vuets pkgname=cuneiform pkgver=1.1.0 _dpkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." arch=('i686' 'x86_64') url="https://launchpad.net/cuneiform-linux" license=('BSD') -depends=(imagemagick) -makedepends=(cmake) +depends=('imagemagick') +makedepends=('cmake') source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2) md5sums=('09fd160cdfc512f26442a7e91246598d') +_SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" + build() { - _SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" cd "${_SRC_ROOT}" sed -i 's#lib64#lib#' install_files.cmake mkdir builddir @@ -24,9 +25,12 @@ build() { cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr .. make +} + +package() { + cd "${_SRC_ROOT}"/builddir make DESTDIR="${pkgdir}" install - mkdir -p "${pkgdir}/usr/share/licenses/cuneiform" - cp "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ - "${pkgdir}/usr/share/licenses/cuneiform" + install -Dm644 "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ + "${pkgdir}/usr/share/licenses/cuneiform/license.txt" } diff --git a/community/gnucap/PKGBUILD b/community/gnucap/PKGBUILD index 48418b391..1b9e4fec5 100644 --- a/community/gnucap/PKGBUILD +++ b/community/gnucap/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 6388 2009-12-09 17:45:13Z foutrelis $ -# Maintainer: Evangelos Foutras +# $Id: PKGBUILD 55492 2011-09-13 05:23:39Z foutrelis $ +# Maintainer: Evangelos Foutras # Contributor: Jared Casper # Contributor: Georgij Kondratjev pkgname=gnucap pkgver=20091207 _pkgver=2009-12-07 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Circuit Analysis Package" arch=('i686' 'x86_64') url="http://gnucap.org/" license=('GPL') depends=('gcc-libs' 'readline') source=(http://gnucap.org/devel/$pkgname-$_pkgver.tar.gz) -md5sums=('30701d110a3e642c5826358c64d2fb1b') +sha1sums=('a64be626b3e971437d677f14bc72eda0df6e7e3a') build() { cd "$srcdir/$pkgname-$_pkgver" ./configure --prefix=/usr - make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$_pkgver" + + make make DESTDIR="$pkgdir" install } diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index 37192330a..7debef2fe 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 49787 2011-06-21 05:02:34Z foutrelis $ -# Maintainer: Evangelos Foutras +# $Id: PKGBUILD 55487 2011-09-13 04:57:50Z foutrelis $ +# Maintainer: Evangelos Foutras pkgname=libmemcached -pkgver=0.50 +pkgver=0.52 pkgrel=1 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glibc') makedepends=('perl') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('c8627014a37cd821cf93317b8de6f9f8') +sha1sums=('5219e261c84b8960676add5968a913a12caccd4a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD index 51d32eadb..6ebe4ff88 100644 --- a/community/mashup/PKGBUILD +++ b/community/mashup/PKGBUILD @@ -2,16 +2,16 @@ # Maintainer: Stefan Husmann pkgname=mashup -pkgver=3.0 +pkgver=3.1 pkgrel=1 pkgdesc="Adjusting images on a sheet of paper for printing" -url="http://kornelix.squarespace.com/printoxx" +url="http://kornelix.squarespace.com/$pkgname" arch=('i686' 'x86_64') license=('GPL3') depends=('gtk2') replaces=('printoxx') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('feb7f5557fce1a00c377d2c6b8a9e2fc') +md5sums=('f6a5afb0a5d410934cbbf4303b3b8a9b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/mms_client/PKGBUILD b/community/mms_client/PKGBUILD index fee06add1..14854aea0 100644 --- a/community/mms_client/PKGBUILD +++ b/community/mms_client/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55469 2011-09-13 01:01:58Z ebelanger $ +# $Id: PKGBUILD 55506 2011-09-13 21:16:22Z ebelanger $ # Contributor: William Rea # Maintainer: Daniel J Griffiths @@ -10,7 +10,8 @@ arch=('i686' 'x86_64') url="http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/" license=('GPL') depends=('glibc') -source=(http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/mms_client-0.0.3.tar.gz +#source=(http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/mms_client-0.0.3.tar.gz +source=(http://web.archive.org/web/20071011022352/http://geocities.com/majormms/mms_client-0.0.3.tar.gz mmsclient-0.0.3-fbsd.patch \ mmsclient-0.0.3-r1.patch) md5sums=('c91171a0bbbfb94290d362e907432787' diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 1648fc546..22c2e27d1 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -3,37 +3,29 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=1.8.3 +pkgver=2.0.0 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64') url='http://www.mongodb.org' license=('AGPL3') -depends=('boost-libs' 'js' 'pcre') +depends=('boost-libs') makedepends=('scons' 'boost') optdepends=('libpcap: needed for mongosniff') backup=('etc/mongodb.conf') install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' - 'mongodb.conf' - 'mongodb-1.8.0-spidermonkey-1.8.5-support.patch' - 'add-js185-support-to-SConstruct.diff') -md5sums=('662e7ad6ff9f8e4d16c72c038b4a0c60' - '85eaa28e349fdc6250f883624e624cca' - '4839fe1d638187ca3226e8267b947318' - '2e6409732fba887c9cfe81257b5260ad' - 'ca7e62be31389d951bfd8848b1675c1b') + 'mongodb.conf') +md5sums=('52763985c13e06d85bc125c7d3eb03d9' + '9c67e00f4626ad761a8f7d4e037a54d7' + '4839fe1d638187ca3226e8267b947318') build() { export SCONSFLAGS="$MAKEFLAGS" cd mongodb-src-r${pkgver} - # js185 support https://jira.mongodb.org/browse/SERVER-2887 - patch -Np1 -i ${srcdir}/mongodb-1.8.0-spidermonkey-1.8.5-support.patch - patch -Np0 -i ${srcdir}/add-js185-support-to-SConstruct.diff - scons \ all \ --full diff --git a/community/mongodb/mongodb.rc b/community/mongodb/mongodb.rc index 517258f63..30f2bbf79 100755 --- a/community/mongodb/mongodb.rc +++ b/community/mongodb/mongodb.rc @@ -4,7 +4,7 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof /usr/bin/mongod` +PID=$(pidof /usr/bin/mongod) case "$1" in start) stat_busy "Starting mongodb" @@ -18,7 +18,7 @@ case "$1" in ;; stop) stat_busy "Stopping mongodb" - [ ! -z "$PID" ] && kill $PID &> /dev/null + [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null if [ $? -gt 0 ]; then stat_fail else diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index 0bc1fcd14..b90bfdfed 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,93 +1,76 @@ -# $Id: PKGBUILD 54702 2011-08-23 11:42:16Z spupykin $ +# $Id: PKGBUILD 55503 2011-09-13 16:34:12Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20110823 +pkgver=20110913 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" arch=('i686' 'x86_64') license=('custom:LGPL') depends=('glib2' 'gettext' 'lua' 'libxext' 'libsm') -makedepends=('git' 'pkgconfig' +optdepends=('libxinerama' 'libxrandr') +makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr' 'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra') -conflicts=('ion3') provides=('libtu' 'libextl') - -_gitroot="git://notion.git.sourceforge.net/gitroot/notion/notion" -_gitname="notion" -_gitroot2="git://notion.git.sourceforge.net/gitroot/notion/libtu" -_gitname2="libtu" -_gitroot3="git://notion.git.sourceforge.net/gitroot/notion/libextl" -_gitname3="libextl" -_gitroot4="git://notion.git.sourceforge.net/gitroot/notion/notion-doc" -_gitname4="notion-doc" - -source=(doc-build-fix.patch) -md5sums=('68b348427d0531d2679a8a8d97d51c7d') +_gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion" + "git://notion.git.sourceforge.net/gitroot/notion/libtu" + "git://notion.git.sourceforge.net/gitroot/notion/libextl" + "git://notion.git.sourceforge.net/gitroot/notion/notion-doc" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr") build() { - cd ${srcdir} + cd ${srcdir} + # git clone + for _gitroot in ${_gitroots[@]}; do msg "Connecting to the git repository..." + _gitname=`basename ${_gitroot}` if [ -d ${srcdir}/${_gitname} ]; then - cd ${_gitname} + pushd ${srcdir}/${_gitname} git pull origin + popd else git clone --depth 1 ${_gitroot} - cd ${_gitname} fi - - if [ -d ${srcdir}/${_gitname}/${_gitname2} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot2} - echo - fi - - if [ -d ${srcdir}/${_gitname}/${_gitname3} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot3} - echo - fi - - if [ -d ${srcdir}/${_gitname}/${_gitname4} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot4} - echo - fi - msg "GIT checkout done or server timeout" + done - rm -rf ${srcdir}/${_gitname}-build - cp -r ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build - - cd ${srcdir}/${_gitname}-build - - msg "Starting make..." + # copy to notion-build + rm -rf ${srcdir}/notion-build + cp -r ${srcdir}/notion ${srcdir}/notion-build + for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + cp -r ${srcdir}/$i ${srcdir}/notion-build/ + done - sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ - -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ - -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ - -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ - -i system.mk + # build + cd ${srcdir}/notion-build + msg "Starting make..." + sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ + -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ + -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ + -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ + -i system.mk + make INCLUDES=-I${srcdir}/notion-build - make INCLUDES=-I${srcdir}/${_gitname}-build - (cd notion-doc && patch -p1 <$srcdir/doc-build-fix.patch) - (cd notion-doc && make -j1 TOPDIR=.. all) + for i in ioncore mod_tiling mod_query de mod_menu mod_dock mod_sp mod_statusbar; do + (cd $i && make _exports_doc) + done + for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + (cd $i && make -j1 TOPDIR=.. all) + done } package() { - cd ${srcdir}/${_gitname}-build - make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install - (cd notion-doc && make PREFIX=${pkgdir}/usr TOPDIR=.. install) - mkdir -p ${pkgdir}/usr/share/licenses/notion - cp LICENSE ${pkgdir}/usr/share/licenses/notion + cd ${srcdir}/notion-build + make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install + for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + (cd $i && make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install) + done + mkdir -p ${pkgdir}/usr/share/licenses/notion + cp LICENSE ${pkgdir}/usr/share/licenses/notion } diff --git a/community/ogle-gui/PKGBUILD b/community/ogle-gui/PKGBUILD index 60f5ef688..2c8d95b91 100644 --- a/community/ogle-gui/PKGBUILD +++ b/community/ogle-gui/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 8473 2010-01-20 08:14:50Z ebelanger $ -# Maintainer: Eric Belanger +# $Id: PKGBUILD 55509 2011-09-13 21:28:22Z ebelanger $ +# Maintainer: Eric Bélanger # Contributor: Kritoke pkgname=ogle-gui pkgver=0.9.2 -pkgrel=4 +pkgrel=5 pkgdesc="A gtk2 gui for ogle" arch=('i686' 'x86_64') url="http://www.dtek.chalmers.se/groups/dvd/" -license=("GPL") +license=('GPL') depends=('ogle' 'libglade') -source=(http://www.dtek.chalmers.se/groups/dvd/dist/ogle_gui-${pkgver}.tar.gz) +#source=(http://www.dtek.chalmers.se/groups/dvd/dist/ogle_gui-${pkgver}.tar.gz) +source=(ftp://ftp.archlinux.org/other/community/ogle-gui/ogle_gui-${pkgver}.tar.gz) md5sums=('e685aa3046f9da13532ede9300f2f794') sha1sums=('0d73ec30852b9cd2a9714b5088f6ab6deecf097d') build() { cd "${srcdir}/ogle_gui-${pkgver}" - ./configure --prefix=/usr --enable-gtk2 || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --enable-gtk2 + make +} + +package() { + cd "${srcdir}/ogle_gui-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 7a48e767d..20d072bfb 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52468 2011-07-25 20:19:33Z lcarlier $ +# $Id: PKGBUILD 55515 2011-09-13 21:33:10Z ebelanger $ # Maintainer : Laurent Carlier # Contributor: Christoph Zeiler pkgname=performous pkgver=0.6.1 -pkgrel=7 +pkgrel=8 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index a130f1d47..2255768f0 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Geoffroy Carrier pkgname=qbittorrent -pkgver=2.8.4 +pkgver=2.8.5 pkgrel=1 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('python2: needed for search' install='qbittorrent.install' source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz" 'python2.patch') -md5sums=('85bbc6fe250bf86e734e9891e7c06d6f' +md5sums=('5f081231537d53e4295483eb9a8f94b1' 'db0d79fee8ce3470ad3741d36b02a94c') build() { diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index 37c440cf4..097da624d 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48037 2011-05-27 16:21:40Z spupykin $ +# $Id: PKGBUILD 55517 2011-09-13 21:33:18Z ebelanger $ # Maintainer : Ionut Biru # Contributor: Corrado 'bardo' Primier # Contributor: Tate "Tatey" Johnson pkgname=rss-glx pkgver=0.9.1 -pkgrel=6 +pkgrel=7 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64') url="http://rss-glx.sourceforge.net/" @@ -31,6 +31,10 @@ build() { --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers \ --enable-shared=yes --enable-static=no make CFLAGS="$CFLAGS -I/usr/include/ImageMagick" +} + +package() { + cd ${srcdir}/${pkgname}_${pkgver} make DESTDIR=${pkgdir} install # FS#18300 diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 6d3d8a7bc..d1f035081 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -8,15 +8,18 @@ pkgname=vtk pkgver=5.8.0 -pkgrel=1 +pkgrel=2 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64') url='http://www.vtk.org' license=('BSD') -depends=('libpng' 'libtiff' 'freetype2' 'python2' 'java-runtime' 'tk' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') -optdepends=('gnuplot: plotting tools' +depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') +makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk') +optdepends=('python2: python bindings' + 'java-runtime: java bindings' + 'tk: tcl bindings' + 'gnuplot: plotting tools' 'graphviz: drawing tools') -makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa') source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" 'fixkernelversioncheck.diff') @@ -28,15 +31,9 @@ build() { cd VTK # fix compilation error: http://vtk.org/Bug/view.php?id=12568 - # remove next bunp + # remove next pkgver bump patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff - # fix for libpng 1.4 - remove next time version bump - for _FILE in `grep -Rl "png_set_gray_1_2_4_to_8" *` - do - sed -i 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' ${_FILE} - done - cd ${srcdir} rm -rf build @@ -80,8 +77,6 @@ build() { -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ ${srcdir}/VTK - # j1 is used because of a bug in building with multiple threads - #make -j1 make } -- cgit v1.2.3-54-g00ecf