diff options
40 files changed, 586 insertions, 232 deletions
diff --git a/community/avr-binutils/PKGBUILD b/community/avr-binutils/PKGBUILD index ebd67da97..18ef8f9e6 100644 --- a/community/avr-binutils/PKGBUILD +++ b/community/avr-binutils/PKGBUILD @@ -1,74 +1,67 @@ -# $Id: PKGBUILD 63813 2012-02-05 15:45:13Z bpiotrowski $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 69306 2012-04-13 08:25:33Z schuay $ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: danst0 <danst0@west.de> pkgname=avr-binutils pkgver=2.22 -pkgrel=2 +pkgrel=3 +_pkgname=binutils +_date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils/" license=('GPL') -depends=('glibc>=2.12-5' 'zlib') +depends=('glibc>=2.15' 'zlib') provides=("binutils-avr=$pkgver") replaces=('binutils-avr') options=('!libtool' '!distcc' '!ccache') -source=(http://ftp.gnu.org/gnu/${pkgname/avr-}/${pkgname/avr-}-${pkgver}.tar.bz2{,.sig}) -md5sums=('ee0f10756c84979622b992a4a61ea3f5' - '6aea2485019497583e5c3f5fc4a39cd5') +source=(ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}_${_date}.tar.bz2) + +_builddir=binutils-build build() { - cd "${srcdir}"/${pkgname/avr-}-${pkgver} + cd ${srcdir} + + config_guess=$(${_pkgname}/config.guess) + rm -rf ${_builddir} + mkdir ${_builddir} && cd ${_builddir} - mkdir build - cd build + [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" - CC="gcc -L$(pwd)/bfd/.libs/" - if [ "${CARCH}" = "x86_64" ]; then - ../configure --build=$(../config.guess) \ - --disable-multilib \ - --disable-nls \ - --enable-64-bit-bfd \ - --enable-install-libbfd \ - --includedir=/usr/$(../config.guess)/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --target=avr - else - ../configure --build=$(../config.guess) \ - --disable-nls \ - --enable-install-libbfd \ - --includedir=/usr/$(../config.guess)/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --target=avr - fi + ${srcdir}/${_pkgname}/configure \ + --prefix=/usr \ + --build=${config_guess} \ + --disable-nls \ + --enable-install-libbfd \ + --includedir=/usr/${config_guess}/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --mandir=/usr/share/man \ + --target=avr \ + $CONFIGFLAG - # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. - make configure-host + # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. + make configure-host - make tooldir=/usr + make tooldir=${pkgdir}/usr } package() { - cd "${srcdir}"/${pkgname/avr-}-${pkgver} + cd ${srcdir}/${_builddir} - cd build - make DESTDIR="${pkgdir}" tooldir=/usr install + make DESTDIR=${pkgdir} tooldir=/usr install - rm -f ${pkgdir}/usr/lib/libiberty.a + rm -f ${pkgdir}/usr/lib/libiberty.a - for bin in addr2line ar as c++filt gprof ld nm objcopy objdump ranlib readelf size strings strip ; do - rm -f ${pkgdir}/usr/bin/${bin} || return 1 - done + for bin in ar as nm objcopy objdump ranlib strip ; do + rm -f ${pkgdir}/usr/bin/${bin} + done - for info in as bfd binutils configure gprof ld standards; do - mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info - done + for info in as bfd binutils configure gprof ld standards; do + mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info + done } +md5sums=('de2ac4298732827f8af706fc24020330') diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD index eff6d6b91..e09943802 100644 --- a/community/avr-gcc/PKGBUILD +++ b/community/avr-gcc/PKGBUILD @@ -1,60 +1,70 @@ -# $Id: PKGBUILD 67673 2012-03-13 17:43:08Z schuay $ +# $Id: PKGBUILD 69308 2012-04-13 08:26:08Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: danst0 <danst0@west.de> pkgname=avr-gcc -pkgver=4.6.3 +_pkgname=gcc +pkgver=4.7.0 pkgrel=1 pkgdesc="The GNU avr Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'custom') url="http://gcc.gnu.org/" -depends=('binutils-avr>=2.22' 'cloog' 'ppl' 'gcc-libs>=4.6.0' 'libmpc') +depends=('avr-binutils>=2.22-3' 'cloog' 'ppl' 'gcc-libs>=4.7.0' 'libmpc') provides=("gcc-avr=$pkgver") replaces=('gcc-avr') -options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip') -source=(http://ftp.gnu.org/gnu/gcc/${pkgname/avr-}-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2) +options=('!libtool' '!emptydirs' '!libtool' '!strip') +source=(http://ftp.gnu.org/gnu/gcc/${_pkgname}-${pkgver}/gcc-${pkgver}.tar.bz2) + +_basedir=${srcdir}/${_pkgname}-${pkgver} build() { + # default CFLAGS lead to issues later on when configure + # calls avr-gcc with -march set. export CFLAGS="-O2 -pipe" export CXXFLAGS="-O2 -pipe" - cd "${srcdir}/${pkgname/avr-}-${pkgver}" + cd ${_basedir} - mkdir build - cd build - ../configure --disable-libssp \ - --disable-nls \ - --enable-languages=c,c++ \ - --infodir=/usr/share/info \ + # Do not install libiberty + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + + echo ${pkgver} > gcc/BASE-VER + + cd ${srcdir} + mkdir gcc-build && cd gcc-build + + ${_basedir}/configure \ + --prefix=/usr \ --libdir=/usr/lib \ --libexecdir=/usr/lib \ --mandir=/usr/share/man \ - --prefix=/usr \ + --infodir=/usr/share/info \ + --enable-languages=c,c++ \ + --disable-libssp \ + --disable-nls \ --target=avr \ - --with-gnu-as \ - --with-gnu-ld \ --with-as=/usr/bin/avr-as \ - --with-ld=/usr/bin/avr-ld + --with-ld=/usr/bin/avr-ld \ + --with-gnu-as \ + --with-gnu-ld make } package() { - cd "${srcdir}/${pkgname/avr-}-${pkgver}" + cd ${srcdir}/gcc-build - cd build make -j1 DESTDIR=${pkgdir} install - install -Dm644 "${srcdir}/${pkgname/avr-}-${pkgver}/COPYING.RUNTIME" \ - "${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION" + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION - rm -f ${pkgdir}/usr/lib/libiberty.a rm -rf ${pkgdir}/usr/share/man/man7 rm -rf ${pkgdir}/usr/share/info } -md5sums=('766091220c6a14fcaa2c06dd573e3758' - '37515158a0fb3d0800ec41a08c05e69e') +md5sums=('2a0f1d99fda235c29d40b561f81d9a77') diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index c0e843c15..9eab4e27a 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68172 2012-03-18 20:40:01Z svenstaro $ +# $Id: PKGBUILD 69334 2012-04-14 03:33:13Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,15 +7,15 @@ pkgname=('dmd' 'libphobos') pkgbase=dmd -pkgver=2.058 -pkgrel=2 +pkgver=2.059 +pkgrel=1 pkgdesc="The Digital Mars D compiler" arch=('i686' 'x86_64') url="http://www.digitalmars.com/d/2.0/" source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip - tools.tar.gz::https://github.com/D-Programming-Language/tools/tarball/v${pkgver}) -md5sums=('81a0fe7b635d3a38ecbefff6048a37fe' - 'cce5249b59a38a4c0eddf113aff87698') + tools-${pkgver}.tar.gz::https://github.com/D-Programming-Language/tools/tarball/v${pkgver}) +md5sums=('803b182e71c4b021dfd1811066201140' + '1605a9cff8ac7b2228dad5f4f217dfec') license=('custom') [[ $CARCH == "x86_64" ]] && _archbits="64" @@ -33,8 +33,9 @@ build() { cd ../phobos make -f posix.mak MODEL=$_archbits DMD=../dmd/dmd - cd $srcdir/D-Programming-Language-tools-* - $srcdir/dmd2/src/dmd/dmd -I$srcdir/dmd2/src/druntime/import/ -I$srcdir/dmd2/src/phobos -L-L$srcdir/dmd2/src/phobos/generated/linux/release/$_archbits/ rdmd.d + # Building rdmd ourselves breaks in dmd 2.059 + #cd $srcdir/D-Programming-Language-tools-* + #$srcdir/dmd2/src/dmd/dmd -I$srcdir/dmd2/src/druntime/import/ -I$srcdir/dmd2/src/phobos -L-L$srcdir/dmd2/src/phobos/generated/linux/release/$_archbits/ rdmd.d } package_dmd() { @@ -57,7 +58,12 @@ package_dmd() { find $pkgdir/usr -type f | xargs chmod 0644 chmod 755 $pkgdir/usr/bin/* - install -Dm755 $srcdir/D-Programming-Language-tools-*/rdmd $pkgdir/usr/bin/rdmd + install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/ddemangle $pkgdir/usr/bin/ddemangle + install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/dman $pkgdir/usr/bin/dman + install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/dumpobj $pkgdir/usr/bin/dumpobj + install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/obj2asm $pkgdir/usr/bin/obj2asm + install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/rdmd $pkgdir/usr/bin/rdmd + #install -Dm755 $srcdir/D-Programming-Language-tools-*/rdmd $pkgdir/usr/bin/rdmd } package_libphobos() { diff --git a/community/libcryptui/PKGBUILD b/community/libcryptui/PKGBUILD new file mode 100644 index 000000000..3e015cecf --- /dev/null +++ b/community/libcryptui/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 69329 2012-04-13 22:06:22Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=libcryptui +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Library for OpenPGP prompts" +arch=('i686' 'x86_64') +url="http://git.gnome.org/browse/libcryptui/" +license=('GPL') +depends=('gtk3' 'libsm' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('23e84fd9e733e58bd1640b229cfc35830287628125f0f15604ea6aecd606fac7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-compile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/libcryptui/libcryptui.install b/community/libcryptui/libcryptui.install new file mode 100644 index 000000000..7a903e80c --- /dev/null +++ b/community/libcryptui/libcryptui.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index 2952aacb4..a4d998095 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68323 2012-03-21 16:50:13Z svenstaro $ +# $Id: PKGBUILD 69320 2012-04-13 16:10:58Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,7 +6,7 @@ pkgname=nbd pkgver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Tools for network block devices, allowing you to use remote block devices over TCP/IP." arch=('i686' 'x86_64') url="http://nbd.sourceforge.net" @@ -17,7 +17,7 @@ backup=('etc/nbd-server/config') depends=('glib2') install=nbd.install md5sums=('81f549155267536ad30851eb50ee8d1c' - '075be420c3d7d7fc9408def3cb8c470d' + '2d05d426b8c2708d5f8a0d028fcbae05' 'e7b13a8b3369e11927d9917664557efa') build(){ diff --git a/community/nbd/config b/community/nbd/config index f90c36b23..777f0ef24 100644 --- a/community/nbd/config +++ b/community/nbd/config @@ -1,4 +1,3 @@ -# This is a comment [generic] # The [generic] section is required, even if nothing is specified # there. @@ -7,9 +6,18 @@ # _before_ opening files. user = nbd group = nbd + # Since version 2.9.17, nbd-server will do exports on a name + # basis (the used name is the name of the section in which the + # export is specified). This however required an incompatible + # protocol change. To enable backwards-compatible port-based + # exports, uncomment the following line: + # oldstyle = true [export1] exportname = /export/nbd/export1-file - port = 12345 + # The following line will be ignored unless the + # "oldstyle = true" line in the generic section above is + # enabled. + #port = 12345 authfile = /export/nbd/export1-authfile timeout = 30 filesize = 10000000 @@ -20,5 +28,6 @@ postrun = rm -f %s [otherexport] exportname = /export/nbd/experiment - port = 12346 - # The other options are all optional. + # The other options are all optional, except this one in case + # the oldstyle option is used in [generic]: + # port = 12346 diff --git a/community/openbsd-netcat/PKGBUILD b/community/openbsd-netcat/PKGBUILD index 35f531dea..bcd294ade 100644 --- a/community/openbsd-netcat/PKGBUILD +++ b/community/openbsd-netcat/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 67793 2012-03-14 13:02:34Z spupykin $ +# $Id: PKGBUILD 69318 2012-04-13 16:10:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname="openbsd-netcat" pkgver=1.105 -pkgrel=1 +pkgrel=2 _patch=4 pkgdesc="TCP/IP swiss army knife. OpenBSD variant." arch=('i686' 'x86_64') url="http://packages.debian.org/sid/netcat-openbsd" license=('BSD') -depends=('glib2' 'libbsd') +depends=('libbsd') makedepends=('gcc' 'make') source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}.orig.tar.gz" "http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${_patch}.debian.tar.gz") diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index 36ae0b451..f4332f51e 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69179 2012-04-10 00:12:07Z spupykin $ +# $Id: PKGBUILD 69321 2012-04-13 16:11:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> @@ -6,7 +6,7 @@ pkgname=pgadmin3 pkgver=1.14.2 -pkgrel=1 +pkgrel=2 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64') url="http://www.pgadmin.org" @@ -18,13 +18,13 @@ md5sums=('49f039353539b346616b663bbedd17c8') build() { cd "$srcdir" + convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png + cp pgadmin3-3.png pgadmin3.png gendesk cd "pgadmin3-${pkgver}" [ -f Makefile ] || ./configure --prefix=/usr make - - convert pgadmin/include/images/pgAdmin3.ico pgadmin3.png } package() { diff --git a/community/seahorse-nautilus/PKGBUILD b/community/seahorse-nautilus/PKGBUILD new file mode 100644 index 000000000..884840d1f --- /dev/null +++ b/community/seahorse-nautilus/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 69331 2012-04-14 01:17:42Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=seahorse-nautilus +pkgver=3.4.0 +pkgrel=1 +pkgdesc="PGP encryption and signing for nautilus" +arch=('i686' 'x86_64') +url="http://git.gnome.org/browse/seahorse-nautilus/" +license=('GPL') +depends=('gconf' 'libcryptui' 'nautilus') +makedepends=('intltool') +replaces=('seahorse-plugins') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('4724438b8c09d5c25c30a304cbc398950d5a2fdd1e2ef3f6389ffbf18ac01480') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/seahorse-nautilus/seahorse-nautilus.install b/community/seahorse-nautilus/seahorse-nautilus.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/community/seahorse-nautilus/seahorse-nautilus.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 070110d74..9d7659488 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,45 +1,22 @@ -# $Id: PKGBUILD 68697 2012-03-31 21:54:47Z svenstaro $ +# $Id: PKGBUILD 69315 2012-04-13 15:58:59Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> pkgname=sfml - -_git=true - -if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20120331 -fi - +pkgver=2.0rc1 pkgrel=1 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' arch=('i686' 'x86_64') url='http://www.sfml-dev.org/' license=('zlib') depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') -makedepends=('git' 'mesa' 'cmake' 'doxygen') +makedepends=('mesa' 'cmake' 'doxygen') install=sfml.install - -_gitroot='https://github.com/LaurentGomila/SFML.git' -_gitname='SFML' +source=("2.0-rc.tar.gz::https://github.com/LaurentGomila/SFML/tarball/2.0-rc") +md5sums=('03c8e6817f4525092b94a3d44e8eada8') build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot - cd $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" + cd "$srcdir"/Laurent* mkdir build && cd build cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ @@ -50,7 +27,7 @@ build() { } package() { - cd "$srcdir/$_gitname-build/build" + cd "$srcdir"/Laurent*/build make DESTDIR="$pkgdir/" install diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 232de3609..3dc942861 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,22 +1,28 @@ # Maintainer: Jakob Gruber <jakob.gruber@gmail.com> pkgname=stone-soup -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 -pkgdesc='An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' +pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') url='http://crawl.develz.org/' -depends=('lua' 'ncurses' 'sdl_image' 'sqlite3' 'libgl' 'mesa' 'freetype2') -makedepends=('bison' 'flex') +depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'freetype2') +makedepends=('bison' 'flex' 'gendesk') conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git') license=('custom') install=stone-soup.install -source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.xz" - "${pkgname}.desktop") +source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.xz") +md5sums=('60f46bc6936db6fe5de81220ab8513bd') + +# used by gendesk to create .desktop file +_exec=('crawl-tiles') +_name=('Dungeon Crawl Stone Soup') build() { + cd "$srcdir" + gendesk -n - cd "${srcdir}/stone_soup-${pkgver}/source" + cd "stone_soup-${pkgver}/source" # adjust makefile to use /usr/bin, owner root:root, # disable setgid on executable @@ -61,5 +67,3 @@ build() { } # vim: ts=4:sw=4:expandtab -md5sums=('3afd529a30d73c9ab896e1704c4215a5' - 'afdacb4c39342e75674efb88eeb3da21') diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD index a51b38f27..b387f32cb 100644 --- a/community/xmlrpc-c/PKGBUILD +++ b/community/xmlrpc-c/PKGBUILD @@ -1,13 +1,15 @@ -# $Id: PKGBUILD 66818 2012-02-28 23:03:08Z arodseth $ +# $Id: PKGBUILD 69311 2012-04-13 13:20:52Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Vitaliy Berdinskikh <skipper13@root.ua> pkgname=xmlrpc-c +# The webpage is unclear on which version is the latest advanced version (2012-04-13) +# Both the 1.29x series and 1.30.1 are mentioned. I'll go with 1.29.2 for now. pkgver=1.29.2 epoch=1 -pkgrel=1 +pkgrel=2 pkgdesc='XML-RPC for C and C++' arch=('x86_64' 'i686') url='http://xmlrpc-c.sourceforge.net/' @@ -15,8 +17,8 @@ license=('custom') depends=('curl' 'libxml2' 'gcc-libs' 'zlib') makedepends=('libtool' 'setconf') options=('!makeflags' '!libtool') -source=("http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced.tar.gz") -sha256sums=('0807e829ef333bd161d0e6fa1327e6698f467015366fb70f236753cb096ee794') +source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced.tar.gz") +sha256sums=('68f5ae842a490778899f51a7ebec3399b9238f28db94b764646202c48bd8381f') build() { cd "$srcdir/advanced" diff --git a/extra/burp/PKGBUILD b/extra/burp/PKGBUILD new file mode 100644 index 000000000..4851bf32c --- /dev/null +++ b/extra/burp/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 156101 2012-04-14 03:07:41Z dreisner $ +# Maintainer: Dave Reisner <d@falconindy.com> + +pkgname=burp +pkgver=1.6.8 +pkgrel=1 +pkgdesc="A simple AUR uploader" +arch=('i686' 'x86_64') +url="http://github.com/falconindy/burp" +license=('GPL') +depends=('glibc' 'curl') +makedepends=('perl') +source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('57b0043994e8a9a3f8f5a27d7fef5bb4') + +build() { + make -C "$pkgname-$pkgver" +} + +package() { + make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" MANPREFIX=/usr/share/man install +} + diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 285faf4b8..0fba736d4 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 150832 2012-02-23 12:01:17Z juergen $ +# $Id: PKGBUILD 156089 2012-04-13 11:14:35Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.26.0 -pkgrel=2 +pkgrel=3 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') url="http://maxima.sourceforge.net" -depends=('sbcl=1.0.55' 'texinfo' 'sh') +depends=('sbcl=1.0.56' 'texinfo' 'sh') makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') # needs rebuild when bash changes version diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD index f44fb93ba..8dd618cb8 100644 --- a/extra/metalog/PKGBUILD +++ b/extra/metalog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150210 2012-02-14 21:34:23Z juergen $ +# $Id: PKGBUILD 156093 2012-04-13 11:44:31Z juergen $ # Maintainer: juergen <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=metalog pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Metalog is a modern replacement for syslogd and klogd" url="http://metalog.sourceforge.net" license=('GPL') @@ -14,7 +14,7 @@ provides=('logger') backup=('etc/metalog.conf' 'etc/conf.d/metalog') source=("http://sourceforge.net/projects/metalog/files/metalog-2.tar.xz/download" 'metalog' 'metalog.confd') md5sums=('e948d10d780205eae17645c89aee1361' - 'cdd1d34eedbfbc2d9e659bf0a0f58f56' + '9e73301a7f0be291749ee30638527cb9' '86bccd5a02996921e29eff8a0394d11f') build() { diff --git a/extra/metalog/metalog b/extra/metalog/metalog index d30f47289..211002401 100644 --- a/extra/metalog/metalog +++ b/extra/metalog/metalog @@ -6,7 +6,10 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/sbin/metalog` +if [ -f /var/run/metalog.pid ]; then + PID=$(cat /var/run/metalog.pid) 2>/dev/null +fi + case "$1" in start) stat_busy "Starting Metalog" @@ -14,7 +17,6 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - echo $PID > /var/run/metalog.pid add_daemon metalog stat_done fi diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 0af2c89e7..1913200bc 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 154444 2012-03-28 18:29:19Z andrea $ +# $Id: PKGBUILD 156076 2012-04-13 07:51:21Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.22 +pkgver=5.5.23 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -15,7 +15,7 @@ options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('c5b151a70e9ceed5308f108f1ece7b3b' +md5sums=('b614481967dc146c148027b598397b54' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index c2f2e789e..11f8b1388 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 150733 2012-02-21 12:33:12Z juergen $ +# $Id: PKGBUILD 156088 2012-04-13 11:09:01Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.0.55 +pkgver=1.0.56 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -17,7 +17,7 @@ makedepends=('sbcl' 'texinfo') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp") -md5sums=('128fb15c80e8e3f8d4024bd8e04635e0' +md5sums=('f9ba54b20f057e6eb5857929bb259142' '7ac0c1936547f4278198b8bf7725204d') build() { diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD index a1ab3f404..ed75076a0 100644 --- a/extra/xfce4-power-manager/PKGBUILD +++ b/extra/xfce4-power-manager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 154458 2012-03-28 18:59:06Z foutrelis $ +# $Id: PKGBUILD 156097 2012-04-13 12:06:18Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-power-manager pkgver=1.0.11 -pkgrel=1 +pkgrel=2 pkgdesc="Power manager for Xfce desktop" arch=('i686' 'x86_64') url="http://xfce-goodies.berlios.de/" @@ -15,12 +15,18 @@ depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme' makedepends=('pkgconfig' 'intltool') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/apps/$pkgname/1.0/$pkgname-$pkgver.tar.bz2) -sha256sums=('cfa85d839458fa2e9c2ee874d7d64ab00a95d6d51e6acf0ac082ffc700fe4339') +source=(http://archive.xfce.org/src/apps/$pkgname/1.0/$pkgname-$pkgver.tar.bz2 + fix-french-translation.patch) +sha256sums=('cfa85d839458fa2e9c2ee874d7d64ab00a95d6d51e6acf0ac082ffc700fe4339' + 'acae23105905f13d65eafac2a7a03b2f15a1b143e7606ef077ace30497f6c448') build() { cd "$srcdir/$pkgname-$pkgver" + # Fix crashes caused by the French .po file + # https://bugs.archlinux.org/task/29294 + patch -Np1 -i "$srcdir/fix-french-translation.patch" + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfce4-power-manager/fix-french-translation.patch b/extra/xfce4-power-manager/fix-french-translation.patch new file mode 100644 index 000000000..063e533bb --- /dev/null +++ b/extra/xfce4-power-manager/fix-french-translation.patch @@ -0,0 +1,46 @@ +From 634c5c016d3b6e152e20173263790a3bfbbe0640 Mon Sep 17 00:00:00 2001 +From: Mike Massonnet <mmassonnet@gmail.com> +Date: Sun, 08 Apr 2012 11:52:33 +0000 +Subject: l10n: Updated French (fr) translation to 100% + +New status: 211 messages complete with 0 fuzzies and 0 untranslated. + +Transmitted-via: Transifex (translations.xfce.org). +--- +diff --git a/po/fr.po b/po/fr.po +index 78dc6d3..285393f 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -559,9 +559,8 @@ msgid "" + "%s (%i%%)\n" + "%s until is fully charged." + msgstr "" +-"%s\n" +-"Votre %s est en charge (%i%%)\n" +-"%s jusqu'a ce qu'il soit complétement chargé." ++"%s (%i%%)\n" ++"%s jusqu'a ce qu'il soit complètement chargé." + + #: ../src/xfpm-battery.c:230 ../src/xfpm-battery.c:266 + #, c-format +@@ -579,8 +578,7 @@ msgid "" + "%s (%i%%)\n" + "Estimated time left is %s." + msgstr "" +-"%s\n" +-"Votre %s est en décharge (%i%%)\n" ++"%s (%i%%)\n" + "Temps restant estimé est de %s." + + #: ../src/xfpm-battery.c:248 ../src/xfpm-battery.c:269 +@@ -622,7 +620,7 @@ msgid "" + msgstr "" + "%s\n" + "Votre %s est en charge (%i%%)\n" +-"%s jusqu'a ce qu'il soit complétement chargé." ++"%s jusqu'a ce qu'il soit complètement chargé." + + #: ../src/xfpm-battery.c:444 + #, c-format +-- +cgit v0.9.0.3 diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD index d94638df2..a83d218f1 100644 --- a/libre/file-roller-libre/rePKGBUILD +++ b/libre/file-roller-libre/rePKGBUILD @@ -3,7 +3,7 @@ source PKGBUILD #CARCH=x86_64 unset build package md5sums source _repo=extra # Put the repo here -_mirror=ftp://ftp.archlinux.org # Put mirror here +_mirror=http://mirrors.kernel.org/archlinux # Put mirror here source=(PKGBUILD "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" # files for pkg modifications below this line diff --git a/libre/foomatic/PKGBUILD b/libre/foomatic/PKGBUILD index bd5f8da17..5446bb579 100644 --- a/libre/foomatic/PKGBUILD +++ b/libre/foomatic/PKGBUILD @@ -60,7 +60,7 @@ package_foomatic-filters-libre() { optdepends=('perl: for the "beh" Backend End Handler used by cups' 'net-snmp: certain (mostly HP) printers need it to work') - cd ${srcdir}/foomatic-filters-${_filtersver} + cd ${srcdir}/${pkgname}-${_filtersver} ./configure --prefix=/usr --sysconfdir=/etc make make DESTDIR=${pkgdir} install @@ -87,3 +87,6 @@ package_foomatic-db-engine() { } +md5sums=('957a07820f47804ce76dbb59cd79cd1b' + '5283cd5125a96dc0b35d896326512b1a' + 'ccb72c201e14bfc5eb23ea839ecc0623') diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD index 3c519dc28..a87c3082a 100644 --- a/libre/mariadb/PKGBUILD +++ b/libre/mariadb/PKGBUILD @@ -9,9 +9,8 @@ __falsename=MySQL pkgbase=mariadb _pkgbase=MariaDB pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}") -conflicts=("lib${_falsename}client" "${_falsename}-clients" "${_falsename}") pkgver=5.5.23 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.${pkgbase}.org/" @@ -73,6 +72,7 @@ package_libmariadbclient(){ pkgdesc="${_pkgbase} client libraries (branch of ${__falsename})" depends=('openssl') replaces=("lib${_falsename}client") + conflicts=("lib${_falsename}client") provides=("lib${_falsename}client=${pkgver}") cd "${srcdir}"/build @@ -92,6 +92,7 @@ package_mariadb-clients(){ pkgdesc="${_pkgbase} client tools (branch of ${__falsename})" depends=("lib${pkgbase}client") replaces=("${_falsename}-clients") + conflicts=("${_falsename}-clients") provides=("${_falsename}-clients=${pkgver}") cd "${srcdir}"/build @@ -114,6 +115,7 @@ package_mariadb(){ depends=("${pkgbase}-clients") optdepends=('perl-dbi' "perl-dbd-${_falsename}") replaces=("${_falsename}") + conflicts=("${_falsename}") provides=("${_falsename}=${pkgver}") options=('emptydirs') diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD index c4f09188d..e743151b0 100644 --- a/libre/python2-libre/PKGBUILD +++ b/libre/python2-libre/PKGBUILD @@ -6,22 +6,23 @@ _pkgname=python2 pkgname=python2-libre pkgver=2.7.2 -pkgrel=4 +pkgrel=6 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') license=('PSF') url="http://www.python.org/" -depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi') +depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') makedepends=('tk') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') -source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz +source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-4-any.src.tar.xz doc_license_change.patch WDAS.patch linux2.patch - gdbm-magic-values.patch) + gdbm-magic-values.patch + 13156-revert-tls-changeset-subinterpreter.patch) provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") replaces=("$_pkgname") @@ -33,7 +34,7 @@ build() { # See http://bugs.python.org/issue10835 for upstream report sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c - # Enable built-in SQLite3 module to load extensions (fix FS#22122) + # Enable built-in SQLite module to load extensions (fix FS#22122) sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py # FS#23997 @@ -47,6 +48,9 @@ build() { # http://bugs.python.org/issue13007 patch -Np1 -i ../gdbm-magic-values.patch + # http://bugs.python.org/issue13156 + patch -Np1 -i ../13156-revert-tls-changeset-subinterpreter.patch + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat @@ -100,5 +104,6 @@ package() { md5sums=('456d053a5d418adc913a4971e95fe918' '1e6595f85a1da7f42b69456119924d50' '3f8c0e310a0be0bd8b319d6c46bbd427' - '74c04694573e0d331e2a99d7b9179460' - '2874e9d93f4f46c1460605a5c7751372') + '6099a7c1aed80cf04943ee4affa84b5c' + '6de394351179c2ada82e95458ceb13e5' + 'daa5110f092f1406c17de23171529e62') diff --git a/libre/python2-libre/gdbm-magic-values.patch b/libre/python2-libre/gdbm-magic-values.patch index 5613ae35c..471faf2c7 100644 --- a/libre/python2-libre/gdbm-magic-values.patch +++ b/libre/python2-libre/gdbm-magic-values.patch @@ -10,5 +10,3 @@ diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py return "gdbm" # Check for old Berkeley db hash file format v2 -diff -up Python-2.7.2/Misc/NEWS.gdbm-1.9-magic Python-2.7.2/Misc/NEWS - diff --git a/libre/python2-libre/linux2.patch b/libre/python2-libre/linux2.patch index 74ae2aa12..670510fde 100644 --- a/libre/python2-libre/linux2.patch +++ b/libre/python2-libre/linux2.patch @@ -21,4 +21,3 @@ diff --git a/configure.in b/configure.in cygwin*) MACHDEP="cygwin";; darwin*) MACHDEP="darwin";; atheos*) MACHDEP="atheos";; - diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 88debc749..6f7fd8831 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 68663 2012-03-30 20:52:00Z svenstaro $ +# $Id: PKGBUILD 69327 2012-04-13 19:38:30Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('406c61b0162962ab7f539fefd77229af') +md5sums=('a994a2d8ef526407b2085408f0a5e9b4') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" diff --git a/social/seeks/PKGBUILD b/social/seeks/PKGBUILD index 09da52060..53cc57471 100644 --- a/social/seeks/PKGBUILD +++ b/social/seeks/PKGBUILD @@ -2,61 +2,65 @@ # Co-maintainer: Enjolras < 0enjolras0 at laposte dot net > pkgname=seeks -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=2 -pkgdesc="An open decentralized platform for collaborative search content" -arch=('i686' 'x86_64') -url="http://www.seeks-project.info" -license=('AGPL3') +pkgdesc="A social decentralized internet overlay for collaborative searches" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.seeks-project.info/site/" +license=('AGPL3' 'LGPL' 'BSD') backup=('etc/logrotate.d/seeks' 'etc/conf.d/seeks' 'etc/seeks/config') -depends=('curl' 'libevent' 'protobuf' 'tokyotyrant' 'opencv' 'icu') -makedepends=('docbook2x' 'pkg-config' ) -source=("http://downloads.sourceforge.net/project/seeks/hippy/seeks-0.4.0.tar.gz" - 'seeks' - 'seeks.conf.d' - 'seeks.logrotate' - 'logfile.patch') -install='install' +depends=('curl' 'libevent>=2.0' 'libxml2' 'opencv' 'protobuf' 'icu' 'tokyotyrant') +makedepends=('pkg-config' 'docbook-xml' 'docbook2x') +source=("http://downloads.sourceforge.net/project/${pkgname}/hippy/${pkgname}-${pkgver}.tar.gz" +'seeks.conf.d' + 'seeks.rc.d' + 'img_websearch.patch' + 'conf.patch' + 'seeks.logrotate') +install=seeks.install build() { - cd "$srcdir/$pkgname-$pkgver" - - autoreconf -ivs - sed -i s/docbook2x-man/docbook2man/ ./configure - ./configure LDFLAGS="-Wl,--no-as-needed" \ - --prefix=/usr --sysconfdir=/etc \ - --enable-opencv --enable-httpserv-plugin --enable-image-websearch-plugin=yes \ - --enable-xslserializer-plugin --enable-personalization --enable-keepalive --enable-extended-host-patterns - - sed -i s/cxflann.h/cv.h/ src/plugins/img_websearch/ocvsurf.cpp - sed -i s/,--as-needed,/,/ config.status - - make - + cd "$srcdir/$pkgname-$pkgver" + # replace <cxflann.h> by <cv.h> + patch -p1 -i "$srcdir/img_websearch.patch" + + # linking issue with --as-needed linker flag, Cli not building with RC2 + LDFLAGS="-Wl,--no-as-needed" \ + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --enable-httpserv-plugin \ + --enable-extended-host-patterns + #--disable-cli \ + + sed -i s/,--as-needed,/,/ config.status + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check-local } package() { - cd "$srcdir/$pkgname-$pkgver/src/" - - #Changing logdir and logfile options - #disable plugins cf and query-capture in config - patch -p0 < "$srcdir/logfile.patch" - - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -D -m644 Licenses "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -m644 AGPL-3.txt "${pkgdir}/usr/share/licenses/${pkgname}/" - install -m644 BSD-yui.txt "${pkgdir}/usr/share/licenses/${pkgname}/" - install -D -m755 ../seeks "${pkgdir}"/etc/rc.d/seeks - install -D -m644 ../seeks.conf.d "${pkgdir}"/etc/conf.d/seeks - install -D -m600 ../seeks.logrotate "${pkgdir}"/etc/logrotate.d/seeks + cd "$srcdir/$pkgname-$pkgver" + # Patch config file to make seeks log in /var/log instead of ./ (needed for rc.d) + patch -p1 -i "$srcdir/conf.patch" + make DESTDIR="$pkgdir/" install + + install -D -m644 Licenses "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 ../seeks.conf.d "${pkgdir}/etc/conf.d/seeks" + install -D -m755 ../seeks.rc.d "${pkgdir}/etc/rc.d/seeks" + install -D -m600 ../seeks.logrotate "${pkgdir}/etc/logrotate.d/seeks" + install -d -m755 "${pkgdir}/var/log/seeks" + install -d -m755 "${pkgdir}/var/lib/seeks" } -md5sums=('a2d0b6e7b91036883c0b327ead5e93c0' - '33e6da05cca492019e6aff39684aed26' - '52e7e06a28974547041012a1cf3207f3' - 'd1aba6739972239c6cd09178807e196f' - 'e352306f5396a1af4dfc81a18bfc5a71') + +# vim:set ts=2 sw=2 et: +md5sums=('2545192be5fa2e70d850f7395d039a0f' + 'ed29089d43873600726d570e63a5043d' + '72a00a931363edd2ed11c0072bfd5b10' + '2554e9f9f733d83203d0926e599e66db' + '71a99dafa726539b9de9055468e2f56c' + '5fbdf9c327999605b0f124132f27a27d') diff --git a/social/seeks/conf.patch b/social/seeks/conf.patch new file mode 100644 index 000000000..93e12c311 --- /dev/null +++ b/social/seeks/conf.patch @@ -0,0 +1,20 @@ +--- a/src/config 2011-11-13 15:21:14.000000000 +0100 ++++ b/src/config 2011-11-13 15:46:15.856186336 +0100 +@@ -148,7 +148,7 @@ + # + # No trailing "/", please. + # +-confdir . ++confdir /etc/seeks + # + # + # 2.2. templdir +@@ -193,7 +193,7 @@ + # + # No trailing "/", please. + # +-logdir . ++logdir /var/log/seeks + # + # + # 2.4. logfile diff --git a/social/seeks/docbook2man.patch b/social/seeks/docbook2man.patch new file mode 100644 index 000000000..c5de2e063 --- /dev/null +++ b/social/seeks/docbook2man.patch @@ -0,0 +1,24 @@ +--- seeks/configure 2011-07-30 15:16:27.000000000 +0200 ++++ seeks/configure.patch 2011-07-30 16:04:34.000000000 +0200 +@@ -16726,10 +16726,10 @@ PCRE_CFLAGS=`$PCRE_CONFIG --cflags` + + + #========================================================================== +-# Finding docbook2x-man ++# Finding docbook2man + #========================================================================== +-# Extract the first word of "docbook2x-man", so it can be a program name with args. +-set dummy docbook2x-man; ac_word=$2 ++# Extract the first word of "docbook2man", so it can be a program name with args. ++set dummy docbook2man; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_prog_docbook+:} false; then : +--- seeks/doc/Makefile.am 2011-07-30 16:51:14.000000000 +0200 ++++ seeks/doc/Makefile.am.patch 2011-07-30 16:55:58.000000000 +0200 +@@ -8,4 +8,4 @@ endif + + EXTRA_DIST=seeks.1.docbook + seeks.1: +- docbook2x-man ${srcdir}/seeks.1.docbook ++ docbook2man ${srcdir}/seeks.1.docbook diff --git a/social/seeks/img_websearch.patch b/social/seeks/img_websearch.patch new file mode 100644 index 000000000..94362e2fc --- /dev/null +++ b/social/seeks/img_websearch.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugins/img_websearch/ocvsurf.cpp b/src/plugins/img_websearch/ocvsurf.cpp +index 5caa9dd..c3cccb4 100644 +--- a/src/plugins/img_websearch/ocvsurf.cpp ++++ b/src/plugins/img_websearch/ocvsurf.cpp +@@ -29,7 +29,7 @@ + #include "miscutil.h" + #include "errlog.h" + +-#include <cxflann.h> ++#include <cv.h> + + #include <iostream> + #include <fstream> diff --git a/social/seeks/seeks.conf.d b/social/seeks/seeks.conf.d index 21ed0526a..c28382aca 100644 --- a/social/seeks/seeks.conf.d +++ b/social/seeks/seeks.conf.d @@ -1,6 +1,11 @@ # -# Array for your vde config files +# Arguments to be passed to the Seeks daemon +# + +# User +SEEKS_USER="seeks" +# Config file (default if empty) SEEKS_CONFIG="" +# Args +SEEKS_ARGS="" -# Parameters to be passed to seeks -SEEKS_ARGS="--daemon --user seeks $SEEKS_CONFIG" diff --git a/social/seeks/seeks.install b/social/seeks/seeks.install new file mode 100644 index 000000000..bf9849e78 --- /dev/null +++ b/social/seeks/seeks.install @@ -0,0 +1,12 @@ +post_install() { + getent group seeks >/dev/null || groupadd -r seeks + getent passwd seeks >/dev/null || useradd -r -c "Seeks daemon" -g seeks -M -d /var/lib/seeks -s /bin/false seeks + passwd -l seeks &>/dev/null + chown seeks:seeks var/log/seeks var/lib/seeks +} + +pre_remove() { + getent passwd seeks &>/dev/null && userdel seeks >/dev/null + getent group seeks &>/dev/null && groupdel seeks >/dev/null + return 0 +} diff --git a/social/seeks/seeks.logrotate b/social/seeks/seeks.logrotate index 24b6f539f..98b411884 100644 --- a/social/seeks/seeks.logrotate +++ b/social/seeks/seeks.logrotate @@ -1,4 +1,4 @@ -/var/log/seeks.log { +/var/log/seeks/logfile { missingok notifempty size 30k diff --git a/social/seeks/seeks.rc.d b/social/seeks/seeks.rc.d new file mode 100644 index 000000000..67de9251a --- /dev/null +++ b/social/seeks/seeks.rc.d @@ -0,0 +1,57 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/seeks + +PIDFILE="/var/run/seeks.pid" + +if [[ -f $PIDFILE ]]; then + read -r PID < "$PIDFILE" + + # prevent stale pidfiles from hanging around + if [[ ! -d /proc/$PID ]]; then + echo 'pid not found. deleteing stale pidfile' + unset PID + rm -f "$PIDFILE" + fi +fi + +case "$1" in + start) + stat_busy "Starting Seeks" + if [[ $PID ]]; then + stat_fail + exit 1 + fi + if /usr/bin/seeks --daemon --pidfile "$PIDFILE" --user $SEEKS_USER $SEEKS_ARGS $SEEKS_CONFIG 2>&1 > /dev/null; then + add_daemon seeks + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping Seeks" + if [[ ! $PID ]]; then + stat_fail + exit 1 + fi + if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then + rm_daemon seeks + stat_done + else + stat_fail + exit 1 + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac + diff --git a/social/seeks/seeksdaemon b/social/seeks/seeksdaemon new file mode 100644 index 000000000..551197d28 --- /dev/null +++ b/social/seeks/seeksdaemon @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/seeks + +PID=`pidof -o %PPID /usr/bin/seeks` + +case "$1" in + start) + stat_busy "Starting seeks daemon" + [ -z "$PID" ] && /usr/bin/seeks $SEEKS_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon seeks + stat_done + fi + ;; + + stop) + stat_busy "Stopping seeks daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon seeks + stat_done + fi + ;; + restart) + $0 stop + while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + +esac +exit 0 + diff --git a/testing/rpcbind/PKGBUILD b/testing/rpcbind/PKGBUILD index c96b0518e..0ca61f79f 100644 --- a/testing/rpcbind/PKGBUILD +++ b/testing/rpcbind/PKGBUILD @@ -1,31 +1,28 @@ -# $Id: PKGBUILD 156056 2012-04-12 15:32:54Z tpowa $ +# $Id: PKGBUILD 156096 2012-04-13 12:06:10Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=rpcbind pkgver=0.2.0 -pkgrel=7 +pkgrel=8 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64) depends=('bash' 'glibc' 'libtirpc') url="http://rpcbind.sourceforge.net" license=('custom') replaces=('portmap') -source=(#http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2 - ftp://ftp.archlinux.org/other/rpcbind/rpcbind-0.2.0.tar.gz - 0001-rpcbind-add-support-for-systemd-socket-activation.patch +source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2 rpcbind-sunrpc.patch + rpcbind.service rpcbind) -md5sums=('1cb086aa6503b97b55382c224c7c77d4' - 'df50ef1e5520ab13d53143899eef82f5' +md5sums=('1a77ddb1aaea8099ab19c351eeb26316' 'c02ac36a98baac70b8a26190524b7b73' + 'd2615f4c0d58f154aab6e294997ac9be' '78a963654f57cbb209e228884767836e') build() { cd $srcdir/$pkgname-$pkgver # patch for iana services file patch -Np1 -i ../rpcbind-sunrpc.patch - # add systemd support - patch -Np1 -i ../0001-rpcbind-add-support-for-systemd-socket-activation.patch ./configure --prefix=/usr --enable-warmstarts --with-statedir=/run make } @@ -42,6 +39,8 @@ package() { install -m644 man/rpcinfo.8 $pkgdir/usr/share/man/man8/ # install daemon install -D -m755 $srcdir/rpcbind $pkgdir/etc/rc.d/rpcbind + # install systemd service file + install -D -m644 $srcdir/rpcbind.service $pkgdir/usr/lib/systemd/system/rpcbind.service # install license install -D -m644 COPYING $pkgdir/usr/share/licenses/rpcbind/COPYING } diff --git a/testing/rpcbind/rpcbind.service b/testing/rpcbind/rpcbind.service new file mode 100644 index 000000000..418ba1e05 --- /dev/null +++ b/testing/rpcbind/rpcbind.service @@ -0,0 +1,11 @@ +[Unit] +Description=RPC Bind +Requires=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/rpcbind +Restart=always + +[Install] +WantedBy=multi-user.target |