diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/bitlbee/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/bluez-hcidump/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/cfitsio/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/cups/PKGBUILD | 49 | ||||
-rwxr-xr-x | extra/cups/cups | 58 | ||||
-rw-r--r-- | extra/cups/cups.install | 12 | ||||
-rw-r--r-- | extra/dotconf/PKGBUILD | 26 | ||||
-rw-r--r-- | extra/fbida/PKGBUILD | 47 | ||||
-rw-r--r-- | extra/gnupg/PKGBUILD | 21 | ||||
-rw-r--r-- | extra/happy/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/libdmtx/PKGBUILD | 16 | ||||
-rw-r--r-- | extra/libindi/PKGBUILD | 22 | ||||
-rw-r--r-- | extra/mpd/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/msmtp/PKGBUILD | 20 | ||||
-rw-r--r-- | extra/obex-data-server/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/pycups/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/pysmbc/PKGBUILD | 16 | ||||
-rw-r--r-- | extra/rcs/PKGBUILD | 37 | ||||
-rw-r--r-- | extra/rcs/path.patch | 67 | ||||
-rw-r--r-- | extra/sip/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/system-config-printer/PKGBUILD | 44 |
21 files changed, 318 insertions, 194 deletions
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 880792b3d..1711534b8 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127301 2011-06-12 14:10:02Z bisson $ +# $Id: PKGBUILD 127641 2011-06-17 11:09:38Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> @@ -7,7 +7,7 @@ pkgname=bitlbee pkgver=3.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64') url='http://www.bitlbee.org/' @@ -31,9 +31,11 @@ build() { --etcdir=/etc/bitlbee \ --pidfile=/var/run/bitlbee/bitlbee.pid \ --ipcsocket=/var/run/bitlbee/bitlbee.sock \ + --systemdsystemunitdir=/lib/systemd/system \ + --ssl=openssl \ --strip=0 \ --otr=1 \ - --ssl=openssl + make } diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD index a7ad9827c..29a5da889 100644 --- a/extra/bluez-hcidump/PKGBUILD +++ b/extra/bluez-hcidump/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 108242 2011-01-30 15:00:57Z andrea $ +# $Id: PKGBUILD 127665 2011-06-17 17:18:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy carrier <geoffroy@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=bluez-hcidump -pkgver=2.0 +pkgver=2.1 pkgrel=1 pkgdesc="Bluetooth HCI package analyzer" url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') depends=('glibc' 'bluez') -source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz) -md5sums=('5c2e3ef0a68b2845047867ba51ff8ac9') +source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz") +md5sums=('b160f0672276398344eebe9df1b37a2c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index e99bbd0d4..554c12923 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 117363 2011-03-31 21:07:25Z andrea $ +# $Id: PKGBUILD 127670 2011-06-17 17:20:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=cfitsio -pkgver=3.270 -_pkgver=3270 +pkgver=3.280 +_pkgver=3280 pkgrel=1 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format" arch=('i686' 'x86_64') url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" license=('GPL2') +depends=('glibc') makedepends=('pkgconfig') options=('!libtool') source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${_pkgver}.tar.gz") -md5sums=('2a72b323de3f40ad1a671f2167500336') +md5sums=('fdb9c0f51678b47e78592c70fb5dc793') build() { - cd ${srcdir}/${pkgname} + cd "${srcdir}"/${pkgname} ./configure --prefix=/usr make shared } package() { - cd ${srcdir}/${pkgname} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname} + make DESTDIR="${pkgdir}" install } diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 2ddf74e03..c717425a3 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 126330 2011-06-04 22:35:21Z andyrtr $ +# $Id: PKGBUILD 127716 2011-06-17 19:45:36Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.4.6 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" -makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' +makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' 'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme') source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-avahi.patch @@ -16,7 +16,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 #options=('!emptydirs') md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1' '8ebd390197501ffd709f0ee546937fd5' - '5c85b7d8d2ddd02c2c64955cebbf55ea' + '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17') @@ -32,14 +32,36 @@ build() { autoconf -I config-scripts ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \ - --with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \ - --disable-ldap --libdir=/usr/lib --enable-raw-printing \ - --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\ - --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS" + --libdir=/usr/lib \ + --with-logdir=/var/log/cups \ + --with-docdir=/usr/share/cups/doc \ + --with-cups-user=daemon \ + --with-cups-group=lp \ + --enable-pam=yes \ + --disable-ldap \ + --enable-raw-printing \ + --enable-dbus --with-dbusdir=/etc/dbus-1 \ + --enable-ssl=yes --enable-gnutls \ + --disable-threads \ + --enable-avahi\ + --with-php=/usr/bin/php-cgi \ + --with-pdftops=pdftops \ + --with-optim="$CFLAGS" + + #reminder + #Restored support for GNU TLS and OpenSSL with threading enabled (STR #3605) in cups 1.5b1 + make } +check() { + cd "$srcdir/$pkgbase-$pkgver" + #httpAddrGetList(workstation64): FAIL + #1 TESTS FAILED! + #make[1]: *** [testhttp] Error 1 + make -k check || /bin/true +} + package_libcups() { pkgdesc="The CUPS Printing System - client libraries and headers" depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi') @@ -66,12 +88,13 @@ backup=(etc/cups/cupsd.conf etc/logrotate.d/cups etc/pam.d/cups etc/xinetd.d/cups-lpd) -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme') +depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme') optdepends=('php: for included phpcups.so module' 'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly' - 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly') + 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly' + 'xdg-utils: xdg .desktop file support') cd ${srcdir}/${pkgbase}-${pkgver} make BUILDROOT=${pkgdir} install-data install-exec @@ -95,7 +118,9 @@ optdepends=('php: for included phpcups.so module' # install ssl directory where to store the certs, solves some samba issues install -dm700 -g lp ${pkgdir}/etc/cups/ssl - install -dm511 -g lp ${pkgdir}/var/run/cups/certs + # remove directory from package, we create it in cups rc.d file + rm -rf ${pkgdir}/var/run +# install -dm511 -g lp ${pkgdir}/var/run/cups/certs # install some more configuration files that will get filled by cupsd touch ${pkgdir}/etc/cups/printers.conf diff --git a/extra/cups/cups b/extra/cups/cups index 4afaf5a7c..744c8e663 100755 --- a/extra/cups/cups +++ b/extra/cups/cups @@ -1,38 +1,68 @@ #!/bin/bash +daemon_name=cupsd + . /etc/rc.conf . /etc/rc.d/functions +#. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} -PID=`pidof -o %PPID /usr/sbin/cupsd` case "$1" in start) - stat_busy "Starting CUPS Daemon" - [ -z "$PID" ] && /usr/sbin/cupsd - if [ $? -gt 0 ]; then - stat_fail + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi else - echo $(pidof -o %PPID -x /usr/sbin/cupsd) > /var/run/cups.pid - add_daemon cups - stat_done + stat_fail + exit 1 fi ;; + stop) - stat_busy "Stopping CUPS Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # if [ $? -gt 0 ]; then stat_fail + exit 1 else - rm /var/run/cups.pid - rm_daemon cups + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name stat_done fi ;; + restart) $0 stop - sleep 1 + sleep 3 $0 start ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart|status}" esac + exit 0 diff --git a/extra/cups/cups.install b/extra/cups/cups.install index e92e17ed3..c4307912b 100644 --- a/extra/cups/cups.install +++ b/extra/cups/cups.install @@ -1,5 +1,7 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi echo ">> If you use an HTTPS connection to CUPS, the first time you access" echo ">> the interface it may take a very long time before the site comes up." echo ">> This is because the first request triggers the generation of the CUPS" @@ -7,9 +9,13 @@ post_install() { } post_upgrade() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi } post_remove() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi } diff --git a/extra/dotconf/PKGBUILD b/extra/dotconf/PKGBUILD index 14b7bb6f1..c33a2d0e5 100644 --- a/extra/dotconf/PKGBUILD +++ b/extra/dotconf/PKGBUILD @@ -1,38 +1,28 @@ -# $Id$ +# $Id: PKGBUILD 127711 2011-06-17 18:24:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Chris Brannon <cmbrannon@cox.net> pkgname=dotconf pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc='A C library for parsing configuration files' -url="http://www.opentts.org/projects/dotconf/" +url="https://github.com/williamh/dotconf" arch=('i686' 'x86_64') depends=('glibc') makedepends=('pkgconfig' 'findutils') license=('LGPL2.1') -source=("http://files.opentts.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('35c19ec9b96648f53e987e47e52dbc4c') +source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/williamh/${pkgname}/tarball/v${pkgver}") +md5sums=('36bfdde245072fc2f4f5766b7db97c45') options=('!libtool') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/williamh-${pkgname}-4cd7b3a + autoreconf -i ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/williamh-${pkgname}-4cd7b3a make DESTDIR="${pkgdir}" install - - # There are no manpages. Docu consists of textfiles and small examples. - # "make install" didn't install the docu, so do it manually. - install -d ${pkgdir}/usr/share/doc/${pkgname} - cp -a doc/*.txt README examples/ ${pkgdir}/usr/share/doc/${pkgname} - # Get rid of files specific to Microsoft products: - find ${pkgdir}/usr/share/doc/${pkgname} -name '*.dsp' | xargs rm -f - - # Dotconf uses libpool internally for memory management. No need to install. - rm -f ${pkgdir}/usr/lib/libpool.a - rm -f ${pkgdir}/usr/include/libpool.h } diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD index cde1743e8..b6081ed88 100644 --- a/extra/fbida/PKGBUILD +++ b/extra/fbida/PKGBUILD @@ -1,42 +1,27 @@ -# $Id: PKGBUILD 70970 2010-03-02 20:48:52Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: damir <damir@archlinux.org> +# $Id: PKGBUILD 127739 2011-06-18 00:11:19Z eric $ +# Maintainer: Eric BĂ©langer <eric@archlinux.org> pkgname=fbida -pkgver=2.07 -pkgrel=5 +pkgver=2.08 +pkgrel=1 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran" arch=('i686' 'x86_64') -url="http://linux.bytesex.org/fbida/" +url="http://www.kraxel.org/blog/linux/fbida/" license=('GPL2') -depends=('giflib' 'libtiff' 'libjpeg' 'libexif' 'lesstif' 'libxpm' 'libpng' 'libx11' 'libxext' 'fontconfig') +depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig') +makedepends=('libxpm') optdepends=('ghostscript: to use fbgs') -replaces=('fbi') -provides=('fbi') -source=(http://dl.bytesex.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz libpng-1.4.patch \ - transupp.h transupp.c jinclude.h) -md5sums=('3e05910fb7c1d9b2bd3e272d96db069c' '31b5a5318c16808d55403e06110ff5a5'\ - '785d928f4ff04e06bd2c8acc6b6c5e7b' 'f2d6f905c4ce6098f6c1af77a0a4eef8'\ - 'dbde79bc104a2caa9316cc2a9df7fd25') -sha1sums=('4758178299e09d5251b9cf20337a81cc20553d45' 'dcb39c82e7e6f4d7d6e8d0e95c661f83a2655c7f'\ - '5028318704fbc8f476f858d24b39cf454a16fe85' '0d9f58703d2eb4ce2d11f42a1ad01d958efe3312'\ - '31ab682733b096b3a98c0a35f9b54a7936e480d5') +source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('9b3693ab26a58194e36b479bffb61ed0') +sha1sums=('597e0953c68112bf7c363b1ccaa94e72100b116a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../libpng-1.4.patch || return 1 - -# Using source code from libjpeg 8a - rm jpeg/* - cp ${srcdir}/transupp.h jpeg/ - cp ${srcdir}/transupp.c jpeg/ - cp ${srcdir}/jinclude.h jpeg/ - - make Make.config || return 1 - for config in HAVE_LIB{SANE,CURL,LIRC}; do - sed -i "s/$config.*/$config := no/" Make.config || return 1 - done - make CC=gcc || return 1 - make DESTDIR="${pkgdir}" prefix=/usr install || return 1 + sed -i 's/ungif/gif/' GNUmakefile + make } +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" prefix=/usr install +} diff --git a/extra/gnupg/PKGBUILD b/extra/gnupg/PKGBUILD index 56b0c2274..997075abb 100644 --- a/extra/gnupg/PKGBUILD +++ b/extra/gnupg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 101334 2010-11-28 23:08:17Z tpowa $ +# $Id: PKGBUILD 127729 2011-06-17 22:03:38Z andyrtr $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=gnupg pkgver=1.4.11 -pkgrel=2 +pkgrel=3 pkgdesc="GNU Privacy Guard - a PGP replacement tool" arch=('i686' 'x86_64') license=('GPL3') @@ -15,14 +15,21 @@ md5sums=('411744e1ef8ce90b87938c4203f001f1') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/lib # docdir can't be set properly - make || return 1 - ln -s ${pkgname}-${pkgver}/scripts .. + ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --enable-noexecstack + make + #ln -s ${pkgname}-${pkgver}/scripts .. # seems obsolete now } - + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check #All 27 tests passed +} + package () { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install # fix fileconflict with gnupg2 pkg rm ${pkgdir}/usr/share/man/man1/gpg-zip.1 diff --git a/extra/happy/PKGBUILD b/extra/happy/PKGBUILD index 47445be85..ac93ba2bf 100644 --- a/extra/happy/PKGBUILD +++ b/extra/happy/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103748 2010-12-22 17:23:27Z remy $ +# $Id: PKGBUILD 127724 2011-06-17 20:54:42Z eric $ # Maintainer: simo <simo@archlinux.org> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> @@ -10,21 +10,21 @@ url="http://www.haskell.org/happy/" arch=('i686' 'x86_64') license=("custom:BSD3") depends=(gmp) -makedepends=(ghc=7.0.1 haskell-mtl=2.0.1.0) +makedepends=(ghc=7.0.2 haskell-mtl=2.0.1.0) options=(strip) source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('7d4d1425f5068633cd477a2b2216880d') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" runhaskell Setup.lhs configure -O --prefix=/usr runhaskell Setup.lhs build } package() { - cd ${srcdir}/${pkgname}-${pkgver} - runhaskell Setup.lhs copy --destdir=${pkgdir} - install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + runhaskell Setup.lhs copy --destdir="${pkgdir}" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD index 5bfaa6476..30f02eb3c 100644 --- a/extra/libdmtx/PKGBUILD +++ b/extra/libdmtx/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 107616 2011-01-26 22:10:46Z andrea $ +# $Id: PKGBUILD 127675 2011-06-17 17:32:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: jose <jose1711 [at] gmail (dot) com> pkgname=libdmtx -pkgver=0.7.2 -pkgrel=2 +pkgver=0.7.4 +pkgrel=1 pkgdesc="A software for reading and writing Data Matrix 2D barcodes" -url=('http://www.libdmtx.org/') +url="http://www.libdmtx.org/" arch=('i686' 'x86_64') license=('GPL2') -depends=('imagemagick') +depends=('glibc' 'imagemagick') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0684cf3857591e777b57248d652444ae') +md5sums=('d3a4c0becd92895eb606dbdb78b023e2') options=('!libtool') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD index 54427ffd4..0de4645b0 100644 --- a/extra/libindi/PKGBUILD +++ b/extra/libindi/PKGBUILD @@ -3,29 +3,23 @@ # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libindi -pkgver=0.7.2 +pkgver=0.8 pkgrel=1 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation" url="http://www.indilib.org/index.php?title=Main_Page" license=('GPL2') arch=('i686' 'x86_64') -depends=('gcc-libs' 'zlib' 'libnova' 'cfitsio') -makedepends=('pkgconfig' 'cmake') +depends=('libnova' 'cfitsio' 'boost-libs') +makedepends=('pkgconfig' 'cmake' 'boost') provides=('indilib') replaces=('indilib') conflicts=('indilib') options=('!libtool') -source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz" - 'linking-pthread.patch') -md5sums=('a78a77dc2322a46f5bf4c5d75380e8b0' - '1ebc282e259cb0c9c52cad3dadd5e044') +source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz") +md5sums=('ca2b7c56431eb5e08218929e5eb72150') build() { - # fixed upstream - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np2 -i ${srcdir}/linking-pthread.patch - - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -35,6 +29,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 57ce12fce..acdf209ef 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 119766 2011-04-14 20:23:04Z schiv $ +# $Id: PKGBUILD 127604 2011-06-16 17:50:00Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.16.2 -pkgrel=3 +pkgver=0.16.3 +pkgrel=1 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64') license=('GPL') @@ -18,7 +18,7 @@ makedepends=('pkgconfig' 'doxygen') install=${pkgname}.install source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" 'mpd') -md5sums=('dedb75cef8e489f3de5231031876fb77' +md5sums=('6e708c02b0e8c288aec855eecf441a5a' 'e5669c2bff4031928531e52475addeb1') build() { diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 3e5e72eda..8975dc93b 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 122860 2011-05-06 19:46:40Z eric $ +# $Id: PKGBUILD 127745 2011-06-18 02:59:47Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Ben Mazer <blm@groknil.org> pkgname=msmtp pkgver=1.4.24 -pkgrel=1 +pkgrel=2 pkgdesc="A mini smtp client" arch=('i686' 'x86_64') license=('GPL3') url="http://msmtp.sourceforge.net" depends=('gnutls' 'libidn') +makedepends=('texlive-core') provides=('smtp-forwarder') -install=${pkgname}.install +install=msmtp.install source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2) md5sums=('3ed704fbd3e7419cab5c65bb7928d9ba') @@ -19,12 +20,19 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls make + make -C doc html pdf } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" -C doc install-html install-pdf - # this can not be the default - #install -Dm644 doc/msmtprc-system.example "${pkgdir}"/etc/msmtprc +# Installing example configs and scripts to /usr/share/doc/msmtp +# as they are not installed by default (Debian and Gentoo do it this way) + install -d "${pkgdir}/usr/share/doc/msmtp" + cp -r scripts/{find_alias,msmtp-gnome-tool,msmtpqueue,msmtpq,set_sendmail} "${pkgdir}/usr/share/doc/msmtp/" + install -D -m644 doc/*.example "${pkgdir}/usr/share/doc/msmtp/" + + install -D -m644 scripts/vim/msmtp.vim "${pkgdir}/usr/share/vim/vimfiles/syntax/msmtp.vim" } diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index 9431d307f..e95119cfb 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 101379 2010-11-29 00:46:39Z andrea $ +# $Id: PKGBUILD 127685 2011-06-17 17:49:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Keerthi <keerthi.linux@gmail.com> pkgname=obex-data-server -pkgver=0.4.5 -pkgrel=3 +pkgver=0.4.6 +pkgrel=1 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64') url="http://wiki.muiline.com/obex-data-server" license=('GPL') depends=('dbus-glib' 'openobex' 'imagemagick') source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz") -md5sums=('8b11e7527c1e3a36a2a9a0c52816ec7b') +md5sums=('961ca5db6fe9c97024e133cc6203cc4d') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD index 9d1109f93..1f9637dc0 100644 --- a/extra/pycups/PKGBUILD +++ b/extra/pycups/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 118849 2011-04-08 14:57:23Z andrea $ +# $Id: PKGBUILD 127690 2011-06-17 17:53:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: nesl247 <nesl247@gmail.com> pkgname=pycups -pkgver=1.9.55 +pkgver=1.9.57 pkgrel=1 pkgdesc="Python CUPS Bindings" url="http://cyberelk.net/tim/software/pycups/" @@ -11,7 +11,7 @@ arch=('i686' 'x86_64') license=('GPL') depends=('libcups' 'python2') source=("http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b2a5082cfacc3350b53e7fee188b2dc5') +md5sums=('64e328e2c628e41862efe97f04e66da4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/pysmbc/PKGBUILD b/extra/pysmbc/PKGBUILD index b3d4f91e8..6a0855ee6 100644 --- a/extra/pysmbc/PKGBUILD +++ b/extra/pysmbc/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 103364 2010-12-18 14:48:53Z andrea $ +# $Id: PKGBUILD 127695 2011-06-17 17:55:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Shane Peelar <lookatyouhacker@gm@il(d0t)c0m> pkgname=pysmbc -pkgver=1.0.10 +pkgver=1.0.11 pkgrel=1 -pkgdesc="Python libsmbclient bindings" +pkgdesc="Python bindings for libsmbclient" arch=('i686' 'x86_64') -url="http://cyberelk.net/tim/software/pysmbc/" +url="http://pypi.python.org/pypi/pysmbc/" license=('GPL') depends=('python2' 'smbclient') -source=("http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('72cc12d6c037c68ca81355151a58083b') +source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('8593053cfe3cc0b79d8c4ab892044d4b') build(){ - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" python2 setup.py build } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" python2 setup.py install --root="$pkgdir" --optimize=1 } diff --git a/extra/rcs/PKGBUILD b/extra/rcs/PKGBUILD index a9edf2fe8..b034c7cda 100644 --- a/extra/rcs/PKGBUILD +++ b/extra/rcs/PKGBUILD @@ -1,22 +1,31 @@ -# $Id: PKGBUILD 78028 2010-04-19 08:23:42Z dgriffiths $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 127635 2011-06-17 10:04:08Z bisson $ +# Contributor: dorphell <dorphell@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + pkgname=rcs pkgver=5.7 -pkgrel=5 -pkgdesc="Revision Control System" +pkgrel=6 +pkgdesc='Revision Control System' arch=('i686' 'x86_64') url="http://www.cs.purdue.edu/homes/trinkle/RCS/" license=('GPL') -depends=('glibc') -source=(http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${pkgver}.tar.Z \ - rcs-5.7.patch) -md5sums=('423282f0edb353296d9f3498ab683abf' '7ae4b7cb79259ccdf5eee0ab94fe2a2a') +source=("http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${pkgver}.tar.Z" \ + 'path.patch') +sha1sums=('976774bda26a7743b8375797f92fbd18e51ac7a2' + '0f0be997e5d018e0d638b5f16430423ccb3774be') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ../rcs-5.7.patch || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 - make prefix=${pkgdir}/usr man1dir=${pkgdir}/usr/share/man/man1 \ - man5dir=${pkgdir}/usr/share/man/man5 install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../path.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make install \ + prefix="${pkgdir}"/usr \ + man1dir="${pkgdir}"/usr/share/man/man1 \ + man5dir="${pkgdir}"/usr/share/man/man5 \ + } diff --git a/extra/rcs/path.patch b/extra/rcs/path.patch new file mode 100644 index 000000000..0f062b357 --- /dev/null +++ b/extra/rcs/path.patch @@ -0,0 +1,67 @@ +diff -Naur rcs-5.7-orig/src/conf.heg rcs-5.7/src/conf.heg +--- rcs-5.7-orig/src/conf.heg 1995-06-02 11:19:00.000000000 -0700 ++++ rcs-5.7/src/conf.heg 2004-11-29 12:41:37.000000000 -0800 +@@ -210,10 +210,10 @@ + /* Do struct stat s and t describe the same file? Answer d if unknown. */ + #define same_file(s,t,d) ((s).st_ino==(t).st_ino && (s).st_dev==(t).st_dev) + #define has_utimbuf 1 /* Does struct utimbuf work? */ +-#define CO "/usr/local/bin/co" /* name of 'co' program */ ++#define CO "/usr/bin/co" /* name of 'co' program */ + #define COMPAT2 0 /* Are version 2 files supported? */ +-#define DIFF "/usr/local/bin/diff" /* name of 'diff' program */ +-#define DIFF3 "/usr/local/bin/diff3" /* name of 'diff3' program */ ++#define DIFF "/usr/bin/diff" /* name of 'diff' program */ ++#define DIFF3 "/usr/bin/diff3" /* name of 'diff3' program */ + #define DIFF3_BIN 1 /* Is diff3 user-visible (not the /usr/lib auxiliary)? */ + #define DIFFFLAGS "-an" /* Make diff output suitable for RCS. */ + #define DIFF_L 1 /* Does diff -L work? */ +@@ -221,7 +221,7 @@ + #define DIFF_FAILURE 1 /* DIFF status if differences are found */ + #define DIFF_TROUBLE 2 /* DIFF status if trouble */ + #define ED "/bin/ed" /* name of 'ed' program (used only if !DIFF3_BIN) */ +-#define MERGE "/usr/local/bin/merge" /* name of 'merge' program */ ++#define MERGE "/usr/bin/merge" /* name of 'merge' program */ + #define TMPDIR "/tmp" /* default directory for temporary files */ + #define SLASH '/' /* principal filename separator */ + #define SLASHes '/' /* `case SLASHes:' labels all filename separators */ +diff -Naur rcs-5.7-orig/src/conf.sh rcs-5.7/src/conf.sh +--- rcs-5.7-orig/src/conf.sh 1995-06-15 23:19:24.000000000 -0700 ++++ rcs-5.7/src/conf.sh 2004-11-29 12:42:28.000000000 -0800 +@@ -32,7 +32,7 @@ + # and can be inspected for clues otherwise. + + # The Makefile overrides the following defaults. +-: ${RCSPREFIX=/usr/local/bin/} ++: ${RCSPREFIX=/usr/bin/} + : ${ALL_CFLAGS=-Dhas_conf_h} + : ${CC=cc} + : ${COMPAT2=0} +@@ -42,8 +42,8 @@ + : ${DIFFFLAGS=-an} + : ${DIFF_L=1} + : ${DIFF_SUCCESS=0} ${DIFF_FAILURE=1} ${DIFF_TROUBLE=2} +-: ${ED=/bin/ed} +-: ${SENDMAIL='"/usr/lib/sendmail"'} ++: ${ED=/usr/bin/ed} ++: ${SENDMAIL='"/usr/sbin/sendmail"'} + # : ${LDFLAGS=} ${LIBS=} tickles old shell bug + + C="$CC $ALL_CFLAGS" +@@ -73,17 +73,6 @@ + ech='echo -n' dots='... ' + esac + +-$ech >&3 "$0: testing permissions $dots" +-rm -f a.d && +-date >a.d && +-chmod 0 a.d && +-{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && { +- echo >&3 "$n$0: This command should not be run with superuser permissions." +- exit 1 +-} +-echo >&3 OK +-rm -f a.d || exit +- + $ech >&3 "$0: testing compiler for plausibility $dots" + echo 'main() { return 0; }' >a.c + rm -f a.exe a.out || exit diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 57a5f4fac..510afc089 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 122180 2011-05-02 17:30:24Z andrea $ +# $Id: PKGBUILD 127700 2011-06-17 17:59:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.12.2 +pkgver=4.12.3 pkgrel=1 arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('9df80f88e0e4022cdd8a8891c6c38048') +md5sums=('d0f1fa60494db04b4d115d4c2d92f79e') build() { cd "${srcdir}" diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 0cc06257a..39bcaabfd 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 117485 2011-04-04 07:01:13Z andrea $ +# $Id: PKGBUILD 127705 2011-06-17 18:04:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=1 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" @@ -12,10 +12,10 @@ arch=('i686' 'x86_64') license=('GPL') makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2') source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz") -md5sums=('34a0ce9a11be5695b3b4065e4f17b009') +md5sums=('658516848c6ced2b1acc6d3525d27204') build() { - cd ${srcdir}/${pkgbase}-${pkgver} + cd "${srcdir}"/${pkgbase}-${pkgver} sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ @@ -39,8 +39,8 @@ package_system-config-printer-common() { provides=("system-config-printer=${pkgver}") conflicts=('system-config-printer') - cd ${srcdir}/${pkgbase}-${pkgver} - install -d ${pkgdir}/usr/share/${pkgbase} + cd "${srcdir}"/${pkgbase}-${pkgver} + install -d "${pkgdir}"/usr/share/${pkgbase} install -m644 config.py \ debug.py \ installpackage.py \ @@ -52,27 +52,27 @@ package_system-config-printer-common() { smburi.py \ statereason.py \ XmlHelper.py \ - ${pkgdir}/usr/share/${pkgbase}/ + "${pkgdir}"/usr/share/${pkgbase}/ install -m755 pysmb.py \ - ${pkgdir}/usr/share/${pkgbase}/ + "${pkgdir}"/usr/share/${pkgbase}/ - install -d ${pkgdir}/etc/dbus-1/system.d/ + install -d "${pkgdir}"/etc/dbus-1/system.d/ install -m644 dbus/com.redhat.NewPrinterNotification.conf \ dbus/com.redhat.PrinterDriversInstaller.conf \ - ${pkgdir}/etc/dbus-1/system.d/ - install -d ${pkgdir}/etc/cupshelpers/ - install -m644 xml/preferreddrivers.xml ${pkgdir}/etc/cupshelpers/ + "${pkgdir}"/etc/dbus-1/system.d/ + install -d "${pkgdir}"/etc/cupshelpers/ + install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/ - install -d ${pkgdir}/lib/udev/rules.d + install -d "${pkgdir}"/lib/udev/rules.d install -m755 udev/{udev-add-printer,udev-configure-printer} \ - ${pkgdir}/lib/udev/ + "${pkgdir}"/lib/udev/ install -m644 udev/70-printers.rules \ - ${pkgdir}/lib/udev/rules.d + "${pkgdir}"/lib/udev/rules.d for file in build/lib/cupshelpers/*.py; do install -Dm644 $file \ - ${pkgdir}/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file) + "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file) done } @@ -81,11 +81,11 @@ package_system-config-printer-gnome() { depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify') optdependence=('gnome-keyring: password management') - cd ${srcdir}/${pkgbase}-${pkgver} + cd "${srcdir}"/${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install # files provided by system-config-printer-common - cd ${pkgdir}/usr/share/${pkgbase} + cd "${pkgdir}"/usr/share/${pkgbase} rm config.py \ debug.py \ installpackage.py \ @@ -98,8 +98,8 @@ package_system-config-printer-gnome() { statereason.py \ XmlHelper.py \ pysmb.py - rm -r ${pkgdir}/etc/dbus-1/ - rm -r ${pkgdir}/etc/cupshelpers/ - rm -r ${pkgdir}/etc/udev/ - rm -r ${pkgdir}/usr/lib/ + rm -r "${pkgdir}"/etc/dbus-1/ + rm -r "${pkgdir}"/etc/cupshelpers/ + rm -r "${pkgdir}"/etc/udev/ + rm -r "${pkgdir}"/usr/lib/ } |