diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/aterm/PKGBUILD | 19 | ||||
-rw-r--r-- | extra/dovecot/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/dovecot/dovecot.install | 18 | ||||
-rwxr-xr-x | extra/dovecot/dovecot.sh | 89 | ||||
-rw-r--r-- | extra/flac/PKGBUILD | 60 | ||||
-rw-r--r-- | extra/glib/PKGBUILD | 34 | ||||
-rw-r--r-- | extra/glib/glib.install | 2 | ||||
-rw-r--r-- | extra/gnome-control-center/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/gnome-settings-daemon/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/libogg/PKGBUILD | 35 | ||||
-rw-r--r-- | extra/nedit/PKGBUILD | 42 | ||||
-rw-r--r-- | extra/qiv/PKGBUILD | 24 | ||||
-rw-r--r-- | extra/rubberband/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/rubberband/gcc46.patch | 10 | ||||
-rw-r--r-- | extra/snd/PKGBUILD | 36 | ||||
-rw-r--r-- | extra/tomcat-native/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/vcdimager/PKGBUILD | 30 | ||||
-rw-r--r-- | extra/vcdimager/vcdimager.install | 4 |
18 files changed, 286 insertions, 170 deletions
diff --git a/extra/aterm/PKGBUILD b/extra/aterm/PKGBUILD index f68bb3065..0dafc580a 100644 --- a/extra/aterm/PKGBUILD +++ b/extra/aterm/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 47932 2009-07-29 18:24:49Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# $Id: PKGBUILD 135001 2011-08-09 20:47:19Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=aterm pkgver=1.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="An xterm replacement with transparency support" arch=('i686' 'x86_64') url="http://aterm.sourceforge.net/" license=('GPL') -depends=('libxext' 'libsm') +depends=('libx11') makedepends=('libxt') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) md5sums=('c2eede028e1011e0ec7035cf319c9b5a') @@ -19,7 +18,11 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-transparency=yes \ --enable-background-image --enable-fading --enable-menubar \ - --enable-graphics || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --enable-graphics + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 8d3718c07..fbbc8dff7 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 123590 2011-05-11 17:20:39Z andyrtr $ +# $Id: PKGBUILD 134967 2011-08-09 17:31:55Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=dovecot pkgver=2.0.13 -pkgrel=1 +pkgrel=2 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') url="http://dovecot.org/" @@ -26,7 +26,7 @@ backup=(etc/dovecot/dovecot.conf install=$pkgname.install source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh) md5sums=('fd8a0702275a61332db7353dadff0f92' - 'd020d43eab4ded6fb379dadc570a9490') + '587159e84e2da6f83d70b3c706ba87cc') build() { cd ${srcdir}/$pkgname-$pkgver @@ -66,9 +66,4 @@ package() { install -m 644 ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/ rm ${pkgdir}/etc/dovecot/README - - # install dovecot userdir - https://bugs.archlinux.org/task/20533 - install -d -m755 ${pkgdir}/var/run/dovecot/{login,empty} - chmod 755 ${pkgdir}/var/run/dovecot - chmod 750 ${pkgdir}/var/run/dovecot/login } diff --git a/extra/dovecot/dovecot.install b/extra/dovecot/dovecot.install index 51d1509ee..ddec178a4 100644 --- a/extra/dovecot/dovecot.install +++ b/extra/dovecot/dovecot.install @@ -11,9 +11,9 @@ post_install() { fi if grep -q "^dovecot:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user" -d /var/run/dovecot/login -u 76 -g dovecot dovecot &> /dev/null + usermod -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot dovecot &> /dev/null else - useradd -s /sbin/nologin -c "Dovecot user" -d /var/run/dovecot/login -u 76 -g dovecot -m -r dovecot &> /dev/null + useradd -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot -r dovecot &> /dev/null fi # dovenull @@ -24,9 +24,9 @@ post_install() { fi if grep -q "^dovenull:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/run/dovecot/login -u 74 -g dovenull dovenull &> /dev/null + usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull dovenull &> /dev/null else - useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/run/dovecot/login -u 74 -g dovenull -m -r dovenull &> /dev/null + useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull -r dovenull &> /dev/null fi # harden some permissions @@ -36,15 +36,19 @@ post_install() { # arg 1: the new package version # arg 2: the old package version post_upgrade() { - post_install $1 if [ "`vercmp $2 2.0.0`" -lt 0 ]; then # important upgrade notice echo "> IMPORTANT DOVECOT 2.0 UPGRADE NOTICE" echo "> ------------------------------------" echo "> see http://wiki2.dovecot.org/Upgrading/2.0" echo "> make sure, you convert the dovecot.conf file" - fi - + fi + if [ "`vercmp $2 2.0.13-2`" -lt 0 ]; then + # to remove no more existant usersdirs simply remove the dovecot users and let them recreate later + userdel dovecot &> /dev/null + userdel dovenull &> /dev/null + fi + post_install $1 } # arg 1: the old package version diff --git a/extra/dovecot/dovecot.sh b/extra/dovecot/dovecot.sh index b7555fe50..e8966bd55 100755 --- a/extra/dovecot/dovecot.sh +++ b/extra/dovecot/dovecot.sh @@ -1,36 +1,69 @@ #!/bin/bash +daemon_name=dovecot + . /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/dovecot` case "$1" in - start) - stat_busy "Starting Dovecot" - [ -z "$PID" ] && /usr/sbin/dovecot - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon dovecot - stat_done - fi - ;; - stop) - stat_busy "Stopping Dovecot" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dovecot - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + start) + 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 + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [[ -n $PID ]] && kill $PID &> /dev/null + # + if [[ $? -gt 0 ]]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" esac + exit 0 diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD index d9d539f3f..56a7cedd2 100644 --- a/extra/flac/PKGBUILD +++ b/extra/flac/PKGBUILD @@ -1,29 +1,51 @@ -# $Id: PKGBUILD 48440 2009-08-02 03:15:27Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# $Id: PKGBUILD 135033 2011-08-09 23:31:20Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> -pkgname=flac +pkgbase=flac +pkgname=('flac' 'flac-doc') pkgver=1.2.1 -pkgrel=2 -pkgdesc="Free Lossless Audio Codec" +pkgrel=3 arch=('i686' 'x86_64') url="http://flac.sourceforge.net/" -license=('custom:Xiph' 'LGPL' 'GPL' 'FDL') -depends=('glibc' 'libogg') +license=('BSD' 'GPL') +depends=('libogg') makedepends=('nasm' 'xmms') options=('!libtool' '!makeflags') -source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz flac-1.2.1-gcc-4.3-includes.patch) -md5sums=('153c8b15a54da428d1f0fadc756c22c7' 'b9d245422bbc547b18a72897366bea77') -sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') +source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz + flac-1.2.1-gcc-4.3-includes.patch) +md5sums=('153c8b15a54da428d1f0fadc756c22c7' + 'b9d245422bbc547b18a72897366bea77') +sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' + '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared --disable-sse \ - --disable-rpath --with-pic || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + cd "${srcdir}/${pkgbase}-${pkgver}" + patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \ + --disable-sse --disable-rpath --with-pic + make +} + +check() { + cd "${srcdir}/${pkgbase}-${pkgver}" + make check +} + +package_flac() { + pkgdesc="Free Lossless Audio Codec" + optdepends=('xmms: for using the xmms plugin') + options=('!libtool' '!docs') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_flac-doc() { + pkgdesc="Developer documentation for the Free Lossless Audio Codec" + depends=('flac') - # install license - install -Dm0644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.Xiph" || return 1 + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" -C doc install + install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD index 48945164c..480a521e2 100644 --- a/extra/glib/PKGBUILD +++ b/extra/glib/PKGBUILD @@ -1,31 +1,37 @@ -# $Id: PKGBUILD 55861 2009-10-15 02:42:14Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 135061 2011-08-10 01:01:44Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glib pkgver=1.2.10 -pkgrel=8.1 +pkgrel=9 pkgdesc="Common C routines used by Gtk+ and other libs" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('LGPL') -depends=('glibc' 'texinfo') +depends=('glibc') options=('!libtool') install=glib.install source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \ gcc340.patch aclocal-fixes.patch) -md5sums=('6fe30dad87c77b91b632def29dd69ef9' '877b3330e822a4be69a0f8a8c268cfd7'\ +md5sums=('6fe30dad87c77b91b632def29dd69ef9' + '877b3330e822a4be69a0f8a8c268cfd7' 'e52c4b88427b9785bb8049dbdc9ff6fb') -sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'\ - 'ae4438cf56c0c9264ee36f6973fb445f9a820be0') +sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' + 'a2cc224a66aeffdcac16ebd9e8af18143cf54918' + 'ae4438cf56c0c9264ee36f6973fb445f9a820be0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../gcc340.patch || return 1 - patch -Np0 -i ../aclocal-fixes.patch || return 1 + patch -Np1 -i ../gcc340.patch + patch -Np0 -i ../aclocal-fixes.patch - [ "$CARCH" = "x86_64" ] && CONFIGFLAG="--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu" - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info $CONFIGFLAG || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + ./configure --prefix=/usr --mandir=/usr/share/man \ + --infodir=/usr/share/info $CONFIGFLAG + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/glib/glib.install b/extra/glib/glib.install index 140fd2fe9..c0046feba 100644 --- a/extra/glib/glib.install +++ b/extra/glib/glib.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(glib.info.gz) post_install() { diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index c75fc2c4a..3fd401126 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 124765 2011-05-24 09:14:06Z heftig $ +# $Id: PKGBUILD 134972 2011-08-09 17:45:09Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') -depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5') +depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop') optdepends=('mesa-demos: provides glxinfo for graphics information' 'apg: adds password generation for user accounts') -makedepends=('gnome-doc-utils' 'intltool' 'networkmanager') +makedepends=('gnome-doc-utils' 'intltool' 'networkmanager' 'namcap') url="http://www.gnome.org" groups=('gnome') install=gnome-control-center.install @@ -23,6 +23,9 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --disable-scrollkeeper --disable-update-mimedb + + #https://bugzilla.gnome.org/show_bug.cgi?id=656229 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool make } diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 25433294c..8a2634a96 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124605 2011-05-23 10:48:57Z ibiru $ +# $Id: PKGBUILD 134977 2011-08-09 18:01:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -24,6 +24,8 @@ build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/bin --disable-static --enable-pulse + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } diff --git a/extra/libogg/PKGBUILD b/extra/libogg/PKGBUILD index 66f9062d3..35bfbfffc 100644 --- a/extra/libogg/PKGBUILD +++ b/extra/libogg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104973 2011-01-05 16:46:37Z heftig $ +# $Id: PKGBUILD 134991 2011-08-09 20:12:08Z eric $ # Maintainer: # Contributor: John Proctor <jproctor@prium.net> pkgname=libogg -pkgver=1.2.2 -pkgrel=1.1 +pkgver=1.3.0 +pkgrel=1 pkgdesc="Ogg bitstream and framing library" arch=('i686' 'x86_64') url="http://www.xiph.org/ogg/" @@ -13,27 +13,26 @@ depends=('glibc') options=('!libtool') source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.xz config_types.h) -md5sums=('203c28a1d356b641253c960365e4cc48' +md5sums=('84a35715170f2cd4c77a4448772b95d5' 'a4d786b1b1955cb85b64fd16cbbee3f9') build() { - cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr - make + cd "$srcdir/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } package() { - cd $srcdir/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install + cd "$srcdir/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install - # install BSD license - install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/COPYING +# install BSD license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - # Resolve multilib conflict - if [[ $CARCH == "x86_64" ]]; then - mv "$pkgdir"/usr/include/ogg/config_types{,-64}.h - install -m 644 "$srcdir/config_types.h" \ - "${pkgdir}/usr/include/ogg/config_types.h" - fi +# Resolve multilib conflict + if [[ $CARCH == "x86_64" ]]; then + mv "$pkgdir"/usr/include/ogg/config_types{,-64}.h + install -m 644 "$srcdir/config_types.h" \ + "${pkgdir}/usr/include/ogg/config_types.h" + fi } diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD index 8cf610d95..250d5e2bd 100644 --- a/extra/nedit/PKGBUILD +++ b/extra/nedit/PKGBUILD @@ -1,30 +1,38 @@ -# $Id: PKGBUILD 47944 2009-07-29 19:36:14Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> and Dale Blount <dale@archlinux.org> +# $Id: PKGBUILD 135019 2011-08-09 21:15:50Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=nedit pkgver=5.5 -pkgrel=5 +pkgrel=6 pkgdesc="A Unix text editor for programmers and general users" arch=('i686' 'x86_64') url="http://www.nedit.org/" license=('GPL') depends=('lesstif' 'libxpm') -source=(http://www.nedit.org/ftp/v5_5/${pkgname}-${pkgver}-src.tar.bz2 nedit_xorg_composite_fix.patch) -md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe' 'ae1f56ae9b23163882051720ac52412d') -sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87' '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e') +source=(http://www.nedit.org/ftp/v5_5/${pkgname}-${pkgver}-src.tar.bz2 + nedit_xorg_composite_fix.patch) +md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe' + 'ae1f56ae9b23163882051720ac52412d') +sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87' + '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../nedit_xorg_composite_fix.patch || return 1 - sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux || return 1 - sed -i 's|fgets|//fgets|' util/check_lin_tif.c || return 1 - sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux || return 1 - sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c || return 1 + patch -p1 < ../nedit_xorg_composite_fix.patch + sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux + sed -i 's|fgets|//fgets|' util/check_lin_tif.c + sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux + sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c - make linux || return 1 - install -D -m755 source/nedit "${pkgdir}/usr/bin/nedit" || return 1 - install -D -m755 source/nc "${pkgdir}/usr/bin/nedit-client" || return 1 - install -D -m644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1" || return 1 - install -D -m644 doc/nc.man "${pkgdir}/usr/share/man/man1/nedit-client.1" || return 1 + make linux docs +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit" + install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client" + install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1" + install -Dm644 doc/nc.man "${pkgdir}/usr/share/man/man1/nedit-client.1" + install -Dm644 doc/nedit.html "${pkgdir}/usr/share/doc/nedit/nedit.html" } diff --git a/extra/qiv/PKGBUILD b/extra/qiv/PKGBUILD index 3a63edc93..fc98e1dc2 100644 --- a/extra/qiv/PKGBUILD +++ b/extra/qiv/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 84750 2010-07-04 02:53:11Z angvp $ +# $Id: PKGBUILD 134996 2011-08-09 20:30:46Z eric $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Paul Mattal <paul@archlinux.org> + pkgname=qiv -pkgver=2.2.3 -pkgrel=2 +pkgver=2.2.4 +pkgrel=1 pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer" arch=('i686' 'x86_64') +url="http://spiegl.de/qiv/" license=('GPL2') depends=('file' 'gtk2' 'imlib2') -makedepends=('pkgconfig') source=(http://spiegl.de/qiv/download/$pkgname-$pkgver.tgz) -url="http://spiegl.de/qiv/" -md5sums=('f692f665ad429f13c732156351420850') +md5sums=('1425f89c90f9c045858fccf24d894c97') build() { - cd $startdir/src/$pkgname-$pkgver || return 1 - make || return 1 - install -D -m 0755 qiv $startdir/pkg/usr/bin/qiv || return 1 - install -D -m 0644 qiv.1 $startdir/pkg/usr/share/man/man1/qiv.1 || return 1 + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -D -m 0755 qiv "$pkgdir/usr/bin/qiv" + install -D -m 0644 qiv.1 "$pkgdir/usr/share/man/man1/qiv.1" } diff --git a/extra/rubberband/PKGBUILD b/extra/rubberband/PKGBUILD index 3566886e3..e5ee7babf 100644 --- a/extra/rubberband/PKGBUILD +++ b/extra/rubberband/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86992 2010-08-08 20:57:26Z schiv $ -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id: PKGBUILD 135007 2011-08-09 21:02:54Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Felipe Machado aka arch_audio <machado.felipe@gmail.com> pkgname=rubberband -pkgver=1.5.0 +pkgver=1.6.0 pkgrel=1 pkgdesc="Time-stretching and pitch-shifting audio library and utility" arch=('i686' 'x86_64') @@ -11,12 +11,17 @@ url="http://www.breakfastquay.com/rubberband/" license=('GPL') depends=('libsamplerate' 'fftw' 'vamp-plugin-sdk') makedepends=('ladspa') -source=(http://code.breakfastquay.com/attachments/download/1/$pkgname-$pkgver.tar.bz2) -md5sums=('c5f288d644fcd46bd159e187bcc33f25') +source=("http://code.breakfastquay.com/attachments/download/16/$pkgname-$pkgver.tar.bz2" + 'gcc46.patch') +md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc' + '7c2f404975da6052f6b80eac12efbeb4') build() { cd "$srcdir/$pkgname-$pkgver" + # fix gcc 4.6 compatibility + patch -Np1 -i "$srcdir/gcc46.patch" + ./configure --prefix=/usr make } @@ -24,7 +29,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" install } # vim:set ts=2 sw=2 et: diff --git a/extra/rubberband/gcc46.patch b/extra/rubberband/gcc46.patch new file mode 100644 index 000000000..38ac76d42 --- /dev/null +++ b/extra/rubberband/gcc46.patch @@ -0,0 +1,10 @@ +--- rubberband-1.6.0.orig/rubberband/RubberBandStretcher.h ++++ rubberband-1.6.0/rubberband/RubberBandStretcher.h +@@ -21,6 +21,7 @@ + + #include <vector> + #include <map> ++#include <cstddef> + + /** + * @mainpage RubberBand diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index cfc281db5..5afcac5a1 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,28 +1,40 @@ -# $Id: PKGBUILD 84807 2010-07-04 16:07:26Z eric $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# $Id: PKGBUILD 135006 2011-08-09 21:00:16Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: dorphell <dorphell@archlinux.org> pkgname=snd -pkgver=11.6 +pkgver=12.3 pkgrel=1 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64') url="http://ccrma.stanford.edu/software/snd/" license=('custom') -depends=('lesstif' 'fam') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('a48bb692ecba320fe6aa2e00fd6d360b') -sha1sums=('383978c94a1f503e331f8f84b21df375fb208c27') +depends=('lesstif' 'jack' 'fam' 'gsl' 'fftw') +makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'libxpm' + 'timidity++' 'mpg123' 'vorbis-tools' 'gmp') +optdepends=('ladspa' 'wavpack' 'flac' 'speex' + 'timidity++' 'mpg123' 'vorbis-tools') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('e1dab6945b9583f02aa6ae73d3780c98') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --without-gsl --without-fftw + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --with-alsa \ + --with-jack make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + cd "$srcdir/$pkgname-$pkgver" + + make prefix="$pkgdir/usr" install + + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" } + +# vim:set ts=2 sw=2 et: diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD index 3686445e1..62e1d8555 100644 --- a/extra/tomcat-native/PKGBUILD +++ b/extra/tomcat-native/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua pkgname=tomcat-native -pkgver=1.1.20 -pkgrel=2 +pkgver=1.1.22 +pkgrel=1 pkgdesc="The Apache Tomcat Native Library" arch=('i686' 'x86_64') url="http://tomcat.apache.org/" @@ -11,7 +11,7 @@ license="Apache" depends=('apr' 'openssl') makedepends=('java-environment') source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) -md5sums=('fb2b9d073cb6575c2d0020eda266ca0c') +md5sums=('44d764f8d99d0454c7337ba9701558ee') build() { cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native" diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD index dc392cb84..f3d94d176 100644 --- a/extra/vcdimager/PKGBUILD +++ b/extra/vcdimager/PKGBUILD @@ -1,24 +1,32 @@ -# $Id: PKGBUILD 59898 2009-11-29 15:48:57Z jgc $ +# $Id: PKGBUILD 135066 2011-08-10 01:37:52Z eric $ # Maintainer: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vcdimager -pkgver=0.7.23 -pkgrel=7 -pkgdesc="GNU VCDImager is a full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's" -arch=(i686 x86_64) -license=('GPL') +pkgver=0.7.24 +pkgrel=1 +pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's" +arch=('i686' 'x86_64') url="http://www.vcdimager.org/" +license=('GPL') depends=('libcdio>=0.82' 'libxml2>=2.7.3' 'popt') options=('!libtool') install=vcdimager.install source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz) -md5sums=('5e7d80fdbf0037ad20e438f2a9573253') +md5sums=('3af22978fd79c79d5fda6513b6811145') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --mandir=/usr/share/man --infodir=/usr/share/info || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/vcdimager/vcdimager.install b/extra/vcdimager/vcdimager.install index faa9748c2..79e07b5bc 100644 --- a/extra/vcdimager/vcdimager.install +++ b/extra/vcdimager/vcdimager.install @@ -1,7 +1,8 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(vcd-info.info.gz vcdimager.info.gz vcdxrip.info.gz) post_install() { + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info $infodir/$file $infodir/dir 2> /dev/null done @@ -12,6 +13,7 @@ post_upgrade() { } pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info --delete $infodir/$file $infodir/dir 2> /dev/null done |