From 4bc61018eec54dbe50e7556ce01d2ef2859b2c9f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 9 Feb 2012 23:14:54 +0000 Subject: Thu Feb 9 23:14:54 UTC 2012 --- community/htmldoc/PKGBUILD | 45 ++++++++++++++++++++++++++++++---------- community/libmicrohttpd/PKGBUILD | 6 +++--- community/mldonkey/PKGBUILD | 6 +++--- community/mldonkey/mldonkeyd | 44 +++++++++++++++++++++++++++------------ community/opensips/PKGBUILD | 16 +++++++------- community/openttd/PKGBUILD | 13 ++++++------ community/pragha/PKGBUILD | 13 ++++++------ community/qmc2/PKGBUILD | 8 +++---- community/scrotwm/PKGBUILD | 6 +++--- community/xlockmore/PKGBUILD | 6 +++--- 10 files changed, 102 insertions(+), 61 deletions(-) (limited to 'community') diff --git a/community/htmldoc/PKGBUILD b/community/htmldoc/PKGBUILD index b498e00f1..9df1f9197 100644 --- a/community/htmldoc/PKGBUILD +++ b/community/htmldoc/PKGBUILD @@ -1,27 +1,50 @@ -# $Id: PKGBUILD 63628 2012-02-05 12:01:52Z ibiru $ +# $Id: PKGBUILD 64143 2012-02-09 02:03:02Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: tobias # Contributor: Simon Rutishauser pkgname=htmldoc -pkgver=1.8.27 -pkgrel=7 +pkgver=1.9.0svn1700 +pkgrel=1 pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices" arch=(i686 x86_64) url="http://www.htmldoc.org" license=('GPL') -depends=('libjpeg' 'libpng' 'openssl' 'fltk' 'gcc-libs' 'libxft' 'libxpm') -source=(ftp://ftp.easysw.com/pub/${pkgname}/${pkgver}/${pkgname}-$pkgver-source.tar.bz2) -md5sums=('35589e7b8fe9c54e11be87cd5aec4dcc') +depends=('libjpeg' 'libpng' 'openssl' 'fltk' 'gcc' 'libxft' 'libxpm') +makedepends=('subversion') +__svntrunk=http://svn.easysw.com/public/htmldoc/trunk/ +__svnmod=htmldoc +source=() +md5sums=() +md5sums=() +md5sums=() build() { - cd $srcdir/${pkgname}-${pkgver} + cd "$srcdir" + + if [ -d $__svnmod/.svn ]; then + (cd $__svnmod && svn up) + else + svn co $__svntrunk --config-dir ./ $__svnmod + fi + + msg "SVN checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$__svnmod-build" + cp -r "$srcdir/$__svnmod" "$srcdir/$__svnmod-build" + cd "$srcdir/$__svnmod-build" + + # + # BUILD + # + [ -x configure ] || autoconf ./configure --prefix=/usr make } package() { - cd $srcdir/${pkgname}-${pkgver} + cd "$srcdir/$__svnmod-build" make install \ prefix=${pkgdir}/usr \ @@ -34,11 +57,11 @@ package() { prefix=$pkgdir/usr \ sysconfdir=$pkgdir/etc - # freedesktop stuff + # fix freedesktop stuff install -Dm 644 desktop/htmldoc-128.png \ - $pkgdir/usr/share/pixmaps/htmldoc.png + ${pkgdir}/usr/share/pixmaps/htmldoc.png echo "MimeType=application/vnd.htmldoc-book;" >> desktop/htmldoc.desktop sed -i 's|X-Red-Hat.*$||' desktop/htmldoc.desktop install -Dm 644 desktop/htmldoc.desktop \ - $pkgdir/usr/share/applications/htmldoc.desktop + ${pkgdir}/usr/share/applications/htmldoc.desktop } diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 7c3836f47..fb96f797e 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 62677 2012-01-24 12:51:51Z spupykin $ +# $Id: PKGBUILD 64124 2012-02-09 00:56:55Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Norberto Lopes # Contributor: Kao Dome @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock pkgname=libmicrohttpd -pkgver=0.9.18 +pkgver=0.9.19 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('af0f282b92413f414cb6daf2d2f618c7') +md5sums=('0f4c55ba224ce75b3b993b558e072a6b') build() { cd ${pkgname}-${pkgver} diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index ea5a0f175..fc9961fb1 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63664 2012-02-05 12:04:35Z ibiru $ +# $Id: PKGBUILD 64114 2012-02-08 23:57:08Z cbrannon $ # Maintainer: Chris Brannon # Contributor: Corrado Primier # Contributor: Alessio 'mOLOk' Bolognino pkgname=mldonkey pkgver=3.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64') url="http://mldonkey.sourceforge.net/" @@ -41,6 +41,6 @@ package() { install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey" } md5sums=('072726d158ba1e936c554be341e7ceff' - '75e4b6c7fb282f7de15a8d5478f3bd70' + '9e90003a012cf17b548dcc647961ffa6' '1f86d92db51c62cded0e6f3833057dee' '1de3266caa49f82bee73ba891eea12cf') diff --git a/community/mldonkey/mldonkeyd b/community/mldonkey/mldonkeyd index 6a458d68e..533aa751c 100644 --- a/community/mldonkey/mldonkeyd +++ b/community/mldonkey/mldonkeyd @@ -1,8 +1,8 @@ #!/bin/bash . /etc/rc.conf -. /etc/conf.d/mldonkey . /etc/rc.d/functions +. /etc/conf.d/mldonkey if [ -z $MLDUSER ] ; then echo "Unable to run MLDonkey. You must set a user in /etc/conf.d/mldonkey ." @@ -27,7 +27,10 @@ fi PIDDIR="/var/run/mldonkey" PIDFILE="$PIDDIR/mlnet.pid" -PID=$(cat $PIDFILE 2>/dev/null) + +getPID() { + echo $(pgrep -u "$MLDUSER" mlnet 2>/dev/null); +} case "$1" in start) @@ -46,19 +49,34 @@ case "$1" in stat_done fi ;; - stop) - stat_busy "Stopping MLDonkey" - [ ! -z $PID ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mldonkey - stat_done - fi - ;; + stop) + stat_busy "Stopping MLDonkey" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f $PIDFILE &>/dev/null + rm_daemon mldonkey + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; restart) $0 stop - sleep 1 $0 start ;; *) diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index d35668224..b019658a2 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 61115 2011-12-21 20:57:48Z andrea $ +# $Id: PKGBUILD 64126 2012-02-09 00:57:46Z spupykin $ # Maintainer: Sergej Pupykin pkgname=opensips -pkgver=1.6.4 -pkgrel=2 +pkgver=1.7.1 +pkgrel=1 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" depends=('gcc-libs' 'openssl' 'db' 'attr' 'kernel-headers' 'libxml2') -makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmysqlclient' 'lynx') +makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmysqlclient' + 'lynx' 'libxslt') optdepends=('postgresql-libs' 'unixodbc' 'libldap' @@ -22,15 +23,14 @@ arch=('i686' 'x86_64') license=('GPL') install=opensips.install options=('!emptydirs' 'zipman' '!makeflags' 'docs') -source=(#http://switch.dl.sourceforge.net/sourceforge/opensips/opensips-$pkgver-tls_src.tar.gz - http://opensips.org/pub/opensips/$pkgver/src/opensips-$pkgver-2-tls_src.tar.gz +source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz opensips.init) -md5sums=('e9869d9a726d70f83de4a1e77cd24d40' +md5sums=('275ecad5146a7571713baf9f3395fe0f' '685fbe00826df1285b410d4610dcbb0c') build() { - cd $srcdir/$pkgname-$pkgver-2-tls/ + cd $srcdir/$pkgname-$pkgver-tls/ # python2 fix for file in $(find . -name '*.py' -print); do diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index 2848f7af2..5e37001ae 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 63690 2012-02-05 12:07:04Z ibiru $ +# $Id: PKGBUILD 64046 2012-02-08 23:19:32Z lcarlier $ # Maintainer: Vesa Kaihlavirta pkgname=openttd -pkgver=1.1.5 +pkgver=1.2.0beta4 +_realpkgver=1.2.0-beta4 pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64') @@ -12,11 +13,11 @@ depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo2' 'hicolor-icon-theme' 'desktop- install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') -source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") -md5sums=('aea731c9f87c53955269446d580ee19e') +source=("http://binaries.openttd.org/releases/${_realpkgver}/${pkgname}-${_realpkgver}-source.tar.xz") +md5sums=('41c18120a3f0d77c8f3ca11e2b6730e7') build() { - cd ${pkgname}-${pkgver} + cd ${pkgname}-${_realpkgver} ./configure \ --prefix-dir=/usr \ @@ -32,7 +33,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd ${pkgname}-${_realpkgver} make install } diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index b06b030e6..ee8d7bdf3 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 64036 2012-02-08 19:28:46Z ttopper $ # Maintainer: Thorsten Töpper # Contributor: Alois Nespor # Contributor: JerichoKru pkgname=pragha -pkgver=0.99.1.1 +pkgver=1.0 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64') url="http://pragha.wikispaces.com/" license=('GPL3') -depends=('libnotify' 'libcdio' 'curl' - 'taglib' 'gstreamer0.10' 'hicolor-icon-theme' - 'gtk2' 'dbus-glib' 'dbus-core' - 'sqlite3' 'glib2' 'desktop-file-utils') +depends=('libnotify' 'libcdio' 'gstreamer0.10-base' + 'taglib' 'hicolor-icon-theme' 'gtk2' + 'dbus-glib' 'sqlite3' 'desktop-file-utils') optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('25ff36e8a197f45edf7309072f1bd55785d9843d') +sha1sums=('b4d2780b065e3141489dcc27c121f01b1d47227c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD index 0ecf20c74..01078e86e 100644 --- a/community/qmc2/PKGBUILD +++ b/community/qmc2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61093 2011-12-21 20:52:27Z andrea $ +# $Id: PKGBUILD 64128 2012-02-09 00:58:33Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: JJDaNiMoTh pkgname=qmc2 -pkgver=0.34 -pkgrel=2 +pkgver=0.35 +pkgrel=1 pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.arcadehits.net" license=("GPL") @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') depends=('qtwebkit' 'phonon' 'sdl') makedepends=('rsync' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") -md5sums=('3439fb62c95ff702e3c4194c05353169') +md5sums=('90b621579ac2773db91550b2650a9daf') build() { cd "$srcdir/$pkgname" diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD index 2bcc42643..e12c4fd3c 100644 --- a/community/scrotwm/PKGBUILD +++ b/community/scrotwm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61972 2012-01-12 00:12:43Z kkeen $ +# $Id: PKGBUILD 64135 2012-02-09 01:36:06Z kkeen $ # Maintainer: Kyle Keen # Contributor: Christoph Zeiler pkgname=scrotwm -pkgver=0.10.0 +pkgver=0.11.0 pkgrel=1 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ backup=(etc/scrotwm.conf) source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ LICENSE \ baraction.sh) -md5sums=('407862684229a2c3282f2c1be59ee0fa' +md5sums=('cf8a0ebc43d0da102db2f75037a6b5df' 'a67cfe51079481e5b0eab1ad371379e3' '6132ba773ee00f39d8f67ac0347a9814') diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index d5104f53e..49ab44988 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61691 2012-01-06 20:47:16Z spupykin $ +# $Id: PKGBUILD 64132 2012-02-09 01:00:06Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: dorphell pkgname=xlockmore -pkgver=5.37 +pkgver=5.38 pkgrel=1 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64) @@ -13,7 +13,7 @@ url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 LICENSE) -md5sums=('526863e7e01c5038de98b996a89d2ac4' +md5sums=('da08b39ea92d2f0b95564b1314f57a42' 'a64afab4283f53972a6702c2e59850d7') build() { -- cgit v1.2.3-54-g00ecf