summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/amule/PKGBUILD8
-rw-r--r--extra/apache/PKGBUILD8
-rw-r--r--extra/apache/pcre_info.patch21
-rw-r--r--extra/appmenu-qt/PKGBUILD29
-rw-r--r--extra/apr/PKGBUILD13
-rw-r--r--extra/dansguardian/PKGBUILD16
-rw-r--r--extra/davfs2/PKGBUILD6
-rw-r--r--extra/ettercap/PKGBUILD4
-rw-r--r--extra/gcin/PKGBUILD6
-rw-r--r--extra/git/PKGBUILD4
-rw-r--r--extra/gtk-xfce-engine/PKGBUILD8
-rw-r--r--extra/imagemagick/PKGBUILD6
-rw-r--r--extra/kdelibs3/PKGBUILD4
-rw-r--r--extra/kismet/PKGBUILD10
-rw-r--r--extra/libdrm/PKGBUILD6
-rw-r--r--extra/libjpeg-turbo/PKGBUILD19
-rw-r--r--extra/libmp3splt/PKGBUILD15
-rw-r--r--extra/lighttpd/PKGBUILD4
-rw-r--r--extra/metalog/PKGBUILD7
-rw-r--r--extra/mpd/ChangeLog3
-rw-r--r--extra/mpd/PKGBUILD8
-rw-r--r--extra/nmap/PKGBUILD11
-rw-r--r--extra/octave/PKGBUILD4
-rw-r--r--extra/php/PKGBUILD11
-rw-r--r--extra/php/pcre_info.patch43
-rw-r--r--extra/postfix/PKGBUILD4
-rw-r--r--extra/rsync/PKGBUILD25
-rw-r--r--extra/slang/PKGBUILD9
-rw-r--r--extra/swig/PKGBUILD4
-rw-r--r--extra/thunar/PKGBUILD4
-rw-r--r--extra/varnish/PKGBUILD4
-rw-r--r--extra/wpa_supplicant_gui/PKGBUILD4
-rw-r--r--extra/xfce4-verve-plugin/PKGBUILD4
-rw-r--r--extra/xmlto/PKGBUILD4
-rw-r--r--extra/xorg-mkfontscale/PKGBUILD6
-rw-r--r--extra/xorg-oclock/PKGBUILD12
-rw-r--r--extra/xorg-xclipboard/PKGBUILD10
-rw-r--r--extra/xorg-xclock/PKGBUILD10
-rw-r--r--extra/xorg-xinit/PKGBUILD8
-rw-r--r--extra/zsh/PKGBUILD4
40 files changed, 258 insertions, 128 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 28da6c0db..c4a5d1885 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 148674 2012-02-05 11:46:28Z ibiru $
+# $Id: PKGBUILD 149910 2012-02-11 17:42:56Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Henrik Ronellenfitsch <searinox@web.de>
# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
pkgname=amule
-pkgver=10708
-pkgrel=2
+pkgver=10750
+pkgrel=1
pkgdesc="An eMule-like client for ed2k p2p network"
arch=('i686' 'x86_64')
url="http://www.amule.org"
license=('GPL')
depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('3c1c2a03b24c9ec7ba6fd675382f26a3')
+md5sums=('997ec360385b7c44ca427f67e078835a')
build() {
cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index 5f9ff1786..d4c54eb94 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149398 2012-02-07 13:58:02Z jgc $
+# $Id: PKGBUILD 149928 2012-02-11 23:28:51Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=apache
pkgver=2.2.22
-pkgrel=2
+pkgrel=3
pkgdesc='A high performance Unix-based HTTP server'
arch=('i686' 'x86_64')
options=('!libtool')
@@ -54,12 +54,12 @@ md5sums=('9fe3093194c8a57f085ff7c3fc43715f'
'6382331e9700ed9e8cc78ea51887b537'
'c7e300a287ef7e2e066ac7639536f87e'
'3d659d41276ba3bfcb20c231eb254e0c'
- 'f74652f3169baaae595026116ef54599')
+ 'fde5121e32b5aeef5a7eedb5a97009ff')
build() {
cd "${srcdir}/httpd-${pkgver}"
- #patch -p1 -i "${srcdir}/pcre_info.patch"
+ patch -p1 -i "${srcdir}/pcre_info.patch"
patch -Np0 -i "${srcdir}/apachectl-confd.patch"
# set default user
diff --git a/extra/apache/pcre_info.patch b/extra/apache/pcre_info.patch
index f1774db63..906a3159e 100644
--- a/extra/apache/pcre_info.patch
+++ b/extra/apache/pcre_info.patch
@@ -1,11 +1,22 @@
---- httpd-2.2.22/server/util_pcre.c 2005-11-11 01:20:05.000000000 +1000
-+++ httpd-2.2.22/server/util_pcre.c 2012-02-06 23:45:37.687946748 +1000
-@@ -137,7 +137,7 @@
+--- httpd-2.2.22/server/util_pcre.c 2005-11-10 16:20:05.000000000 +0100
++++ httpd-2.2.22/server/util_pcre.c 2012-02-08 11:23:56.273855663 +0100
+@@ -128,6 +128,7 @@
+ const char *errorptr;
+ int erroffset;
+ int options = 0;
++int nsub;
- if (preg->re_pcre == NULL) return AP_REG_INVARG;
+ if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
+ if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
+@@ -136,8 +137,9 @@
+ preg->re_erroffset = erroffset;
+ if (preg->re_pcre == NULL) return AP_REG_INVARG;
+-
-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
-+preg->re_nsub = pcre_fullinfo((const pcre *)preg->re_pcre, NULL, NULL, NULL);
++pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
++ PCRE_INFO_CAPTURECOUNT, &nsub);
++preg->re_nsub = nsub;
return 0;
}
diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD
new file mode 100644
index 000000000..b41471824
--- /dev/null
+++ b/extra/appmenu-qt/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 149893 2012-02-11 12:05:06Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=appmenu-qt
+pkgver=0.2.4
+pkgrel=4
+pkgdesc="Allows Qt applications to export menus over DBus to a menu applet"
+arch=('i686' 'x86_64')
+url='https://launchpad.net/appmenu-qt'
+license=('GPL')
+depends=('libdbusmenu-qt')
+makedepends=('cmake')
+source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('5266d3e77e424bce19f4bcd8f4ffd4bf')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE="Release"
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD
index 3f18110f0..98fb60856 100644
--- a/extra/apr/PKGBUILD
+++ b/extra/apr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 125814 2011-05-30 09:11:42Z jgc $
+# $Id: PKGBUILD 149942 2012-02-11 23:30:26Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=apr
pkgver=1.4.5
-pkgrel=1
+pkgrel=2
pkgdesc="The Apache Portable Runtime"
arch=('i686' 'x86_64')
url="http://apr.apache.org/"
@@ -24,5 +24,14 @@ build() {
--enable-nonportable-atomics \
--with-devrandom=/dev/urandom
make
+}
+
+check() {
+ cd "${srcdir}/apr-${pkgver}"
+ make -j1 check
+}
+
+package() {
+ cd "${srcdir}/apr-${pkgver}"
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/dansguardian/PKGBUILD b/extra/dansguardian/PKGBUILD
index 6d943cc2a..07fe2cf16 100644
--- a/extra/dansguardian/PKGBUILD
+++ b/extra/dansguardian/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70467 2010-02-26 21:24:54Z dgriffiths $
+# $Id: PKGBUILD 149944 2012-02-11 23:30:32Z allan $
# Maintainer: Kevin Piche <kevin@archlinux.org>
# Contributor: Manolis Tzanidakis
pkgname=dansguardian
pkgver=2.10.1.1
-pkgrel=2
+pkgrel=3
pkgdesc="Squid plugin for web content filtering."
url="http://dansguardian.org"
arch=('i686' 'x86_64')
@@ -12,8 +12,10 @@ license=('GPL2')
depends=('squid' 'pcre' 'zlib')
install=${pkgname}.install
source=(http://dansguardian.org/downloads/2/Stable/${pkgname}-${pkgver}.tar.gz
-dansguardian dg2.10.1.1-missing.stdio.patch)
-md5sums=('0987a1c9bfbdf398118386f10279611a' 'a65a2cb6309670ad8978f1544907d290'
+ dansguardian
+ dg2.10.1.1-missing.stdio.patch)
+md5sums=('0987a1c9bfbdf398118386f10279611a'
+ 'a65a2cb6309670ad8978f1544907d290'
'3444718c00cc17337cba711ceaa1c0e5')
build() {
@@ -21,7 +23,11 @@ build() {
patch -Np0 -i ${srcdir}/dg2.10.1.1-missing.stdio.patch
./configure --prefix="/usr" --with-proxyuser=proxy --with-proxygroup=proxy \
--sysconfdir=/etc --localstatedir=/var --enable-email
- make || return 1
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
install -D data/scripts/dansguardian ${pkgdir}/etc/logrotate.d/dansguardian
diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD
index ce4340ef7..45b949e89 100644
--- a/extra/davfs2/PKGBUILD
+++ b/extra/davfs2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 111470 2011-02-27 10:09:32Z thomas $
+# $Id: PKGBUILD 149924 2012-02-11 22:48:34Z thomas $
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgname=davfs2
pkgver=1.4.6
-pkgrel=1
-pkgdesc="File system driver that allows you to mount a WebDAV server as a local disk drive."
+pkgrel=2
+pkgdesc="File system driver that allows you to mount a WebDAV folder"
arch=(i686 x86_64)
url="http://savannah.nongnu.org/projects/davfs2"
license=('GPL')
diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD
index 903b506ab..207d020ad 100644
--- a/extra/ettercap/PKGBUILD
+++ b/extra/ettercap/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144996 2011-12-13 22:16:57Z eric $
+# $Id: PKGBUILD 149946 2012-02-11 23:30:37Z allan $
# Maintainer:
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@ pkgbase=ettercap
pkgname=('ettercap' 'ettercap-gtk')
pkgver=NG_0.7.4.2
_origver=${pkgver/_/-}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://ettercap.sourceforge.net/"
license=('GPL')
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index dfd4c6ecb..9725ac6ba 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148586 2012-02-04 00:07:32Z bisson $
+# $Id: PKGBUILD 149828 2012-02-11 09:25:31Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=gcin
-pkgver=2.7.2
+pkgver=2.7.3
pkgrel=1
pkgdesc='Input method server supporting various input methods'
url='http://hyperrate.com/dir.php?eid=67'
@@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method'
'libchewing: support for chewing input method')
source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
'qt4-lib64.patch')
-sha1sums=('f5b4468d8696af114fa95f46a680bee0182ae1ec'
+sha1sums=('d27a236f7d3a3cf54a688ecaeb576325dca4f89f'
'3d1b769dcd8820c8351f239ec32ee5bcd9d98b70')
install=install
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index da2ad916d..48cdca748 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148010 2012-01-29 20:12:07Z dan $
+# $Id: PKGBUILD 149948 2012-02-11 23:30:42Z allan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
pkgver=1.7.9
-pkgrel=1
+pkgrel=2
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64)
url="http://git-scm.com/"
diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD
index 7c7212ff5..8c914307c 100644
--- a/extra/gtk-xfce-engine/PKGBUILD
+++ b/extra/gtk-xfce-engine/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 147260 2012-01-25 08:34:39Z foutrelis $
+# $Id: PKGBUILD 149817 2012-02-11 08:22:29Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: tobias <tobias funnychar archlinux.org>
pkgbase=gtk-xfce-engine
pkgname=('gtk2-xfce-engine' 'gtk3-xfce-engine')
-pkgver=2.99.0
-pkgrel=2
+pkgver=2.99.1
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.xfce.org/"
license=('GPL2')
@@ -13,7 +13,7 @@ groups=('xfce4')
makedepends=('gtk2' 'gtk3')
options=('!libtool')
source=(http://archive.xfce.org/src/xfce/$pkgbase/2.99/$pkgbase-$pkgver.tar.bz2)
-sha256sums=('27bee5a68527d214cfda9b99d4ba68d39b6d341202bc728d0ddd170a73cde154')
+sha256sums=('077a3d68bb560371af902d4aa35ad949c70974e923ecdf2ec946801a480dece2')
build() {
cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 030080c3f..a521688bd 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149151 2012-02-06 00:39:05Z eric $
+# $Id: PKGBUILD 149825 2012-02-11 09:11:58Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgbase=imagemagick
pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.5.1
+pkgver=6.7.5.3
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.imagemagick.org/"
@@ -12,7 +12,7 @@ depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'libjpeg-turbo'
makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
perlmagick.rpath.patch)
-sha1sums=('6970215ee2b95dbbf1b57b8d65e40b2d0d811acb'
+sha1sums=('b6cee59cb380f38572ec40769c438901dcc7500e'
'23405f80904b1de94ebd7bd6fe2a332471b8c283')
build() {
diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD
index 4b1862b2f..888aa10f3 100644
--- a/extra/kdelibs3/PKGBUILD
+++ b/extra/kdelibs3/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148802 2012-02-05 11:51:08Z ibiru $
+# $Id: PKGBUILD 149952 2012-02-11 23:30:53Z allan $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=12
+pkgrel=13
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD
index 015044fe8..a99e03f43 100644
--- a/extra/kismet/PKGBUILD
+++ b/extra/kismet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123234 2011-05-09 12:19:16Z angvp $
+# $Id: PKGBUILD 149954 2012-02-11 23:30:59Z allan $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
# Contributor: Juergen Hoetzel <jason@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=kismet
pkgver=2011_03_R2
_realver="${pkgver//_/-}"
-pkgrel=2
+pkgrel=3
pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
arch=('i686' 'x86_64')
url="http://www.kismetwireless.net/"
@@ -14,15 +14,14 @@ license=('GPL')
depends=('libcap' 'libnl' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat')
makedepends=() # already in core: ('grep' 'gcc-libs')
optdepends=('gpsd: log coordinates of detected networks'
- 'wireshark: provide OUI files used to determine device manufacturer'
- 'wireshark: mergecap, to merge multiple capture files'
+ 'wireshark-cli: provide OUI files used to determine device manufacturer'
+ 'wireshark-cli: mergecap, to merge multiple capture files'
'sox: provide the default kismet sound playback binary'
'festival: text-to-speech support'
'flite: alternative/lightweight text-to-speech support'
'mac80211-driver: full rfmon support'
'ruby: ruby interface')
backup=('etc/kismet.conf' 'etc/kismet_drone.conf')
-options=()
install=kismet.install
changelog=kismet.changelog
source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz")
@@ -56,4 +55,3 @@ package() {
# Our own suid-install, first half (see kismet.install)
install -o "root" -g "root" -m 4550 kismet_capture "${pkgdir}/usr/bin/"
}
-
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 866be38b3..603db7711 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 146314 2012-01-09 15:57:26Z andyrtr $
+# $Id: PKGBUILD 149819 2012-02-11 08:51:30Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libdrm
-pkgver=2.4.30
+pkgver=2.4.31
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64)
@@ -16,7 +16,7 @@ source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
COPYING
# git_fixes.diff
)
-md5sums=('9f57a68b2c0836b55ebcbc241f6ca175'
+md5sums=('b8cf744ec113c6028fe0975b1133b649'
'fb8a15bf4aff5646c517373e8277f440'
'ba65e71c481b94ef0fb6c23c7f21ffa1')
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index 51aa6df6f..d74dd2ca8 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145273 2011-12-21 01:12:32Z allan $
+# $Id: PKGBUILD 149986 2012-02-12 02:54:27Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
pkgname=libjpeg-turbo
-pkgver=1.1.1
-pkgrel=4
+pkgver=1.2.0
+pkgrel=1
pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
arch=('i686' 'x86_64')
url="http://libjpeg-turbo.virtualgl.org/"
@@ -16,11 +16,15 @@ conflicts=('libjpeg')
replaces=('libjpeg')
options=('!libtool')
source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('03b9c1406c7bfdc204313c2917ce6962')
+md5sums=('5329fa80953938cb4f097afae55059e2')
build() {
cd $srcdir/$pkgname-$pkgver
+ # put documentation in a reasonable directory...
+ sed -i "/docdir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in
+ sed -i "/exampledir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in
+
./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
make
}
@@ -42,7 +46,10 @@ package() {
# do not distributre libturbojpeg as it is unversioned
rm $pkgdir/usr/lib/libturbojpeg.{so,a}
rm $pkgdir/usr/include/turbojpeg.h
- rm $pkgdir/usr/bin/jpgtest
- install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE
+ install -dm755 $pkgdir/usr/share/licenses/libjpeg-turbo/
+ ln -s ../../doc/libjpeg-turbo/README \
+ $pkgdir/usr/share/licenses/libjpeg-turbo/README
+ ln -s ../../doc/libjpeg-turbo/README-turbo.txt \
+ $pkgdir/usr/share/licenses/libjpeg-turbo/README-turbo.txt
}
diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD
index f374e413d..c2bd39665 100644
--- a/extra/libmp3splt/PKGBUILD
+++ b/extra/libmp3splt/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 131866 2011-07-16 10:20:18Z tpowa $
+# $Id: PKGBUILD 149956 2012-02-11 23:31:02Z allan $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libmp3splt
pkgver=0.7
-pkgrel=1
-arch=('i686' 'x86_64')
+pkgrel=2
pkgdesc="Library for splitting mp3 and ogg files without decoding"
-license=('GPL')
+arch=('i686' 'x86_64')
url="http://mp3splt.sourceforge.net"
-makedepends=('git')
+license=('GPL')
depends=('libmad' 'libvorbis' 'libid3tag' 'libtool')
-source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz)
+makedepends=('git')
options=(!libtool)
+source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz)
+md5sums=('dadb166361e2a28955032a1b9f10ed38')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -20,8 +21,8 @@ build() {
./configure --prefix=/usr
make
}
+
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir/ install
}
-md5sums=('dadb166361e2a28955032a1b9f10ed38')
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 6491559d8..df6b62d96 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146963 2012-01-19 18:03:44Z pierre $
+# $Id: PKGBUILD 149958 2012-02-11 23:31:05Z allan $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=lighttpd
pkgver=1.4.30
-pkgrel=2
+pkgrel=3
pkgdesc='a secure, fast, compliant and very flexible web-server'
license=('custom')
arch=('i686' 'x86_64')
diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD
index 1f9339602..4d5002f2b 100644
--- a/extra/metalog/PKGBUILD
+++ b/extra/metalog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137711 2011-09-10 13:12:33Z pierre $
+# $Id: PKGBUILD 149960 2012-02-11 23:31:08Z allan $
# Maintainer: juergen <juergen@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=metalog
pkgver=1.0
-pkgrel=2
+pkgrel=3
pkgdesc="Metalog is a modern replacement for syslogd and klogd"
url="http://metalog.sourceforge.net"
license=('GPL')
@@ -13,7 +13,8 @@ depends=('pcre')
provides=('logger')
backup=('etc/metalog.conf' 'etc/conf.d/metalog')
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-1.tar.lzma"
- 'metalog' 'metalog.confd')
+ 'metalog'
+ 'metalog.confd')
md5sums=('df4ec89f6a0df24a43f9592ee80ab6be'
'cdd1d34eedbfbc2d9e659bf0a0f58f56'
'86bccd5a02996921e29eff8a0394d11f')
diff --git a/extra/mpd/ChangeLog b/extra/mpd/ChangeLog
index b22d95f8d..7e174cfb4 100644
--- a/extra/mpd/ChangeLog
+++ b/extra/mpd/ChangeLog
@@ -1,3 +1,6 @@
+2012-02-11 Angel Velasquez <angvp@archlinux.org>
+ * Version bump to 0.16.7
+
2011-12-05 Angel Velasquez <angvp@archlinux.org>
* Version bump to 0.16.6
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 312abfcdf..c9308ddd5 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 148654 2012-02-05 10:51:32Z bisson $
+# $Id: PKGBUILD 149829 2012-02-11 09:25:31Z 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.6
-pkgrel=2
+pkgver=0.16.7
+pkgrel=1
pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
arch=('i686' 'x86_64')
license=('GPL')
@@ -19,7 +19,7 @@ install=${pkgname}.install
changelog=ChangeLog
source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2"
'mpd')
-md5sums=('5489dd327fba12c67f01558d2cfa6d57'
+md5sums=('3d0e7c36646e80386b32966bd4268e8d'
'e5669c2bff4031928531e52475addeb1')
build() {
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD
index b79385d88..541c4b6ca 100644
--- a/extra/nmap/PKGBUILD
+++ b/extra/nmap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 110262 2011-02-18 15:25:57Z angvp $
+# $Id: PKGBUILD 149962 2012-02-11 23:31:11Z allan $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=nmap
pkgver=5.51
-pkgrel=1
+pkgrel=3
pkgdesc="A network exploration tool and security/port scanner"
arch=('i686' 'x86_64')
url="http://nmap.org"
@@ -15,6 +15,7 @@ makedepends=('python2')
optdepends=('pygtk: gui for nmap')
options=('!makeflags')
source=(http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('0b80d2cb92ace5ebba8095a4c2850275')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -22,6 +23,11 @@ build() {
echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap.desktop
echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap-root.desktop
+ # Force usage of external libpcap
+ # OSX bug check fails because of missing types
+ # autoreconf fails because our autotools are too new (?)
+ sed -i 's/have_libpcap=no/have_libpcap=yes/g' {.,ncat,nping}/configure
+
./configure --prefix=/usr --mandir=/usr/share/man \
--libexecdir=/usr/lib
make
@@ -37,4 +43,3 @@ package() {
# install custom GPL2 license
install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
-md5sums=('0b80d2cb92ace5ebba8095a4c2850275')
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 992a398a6..753aa49a4 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 141254 2011-10-27 14:28:28Z ronald $
+# $Id: PKGBUILD 149964 2012-02-11 23:31:17Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor : shining <shiningxc.at.gmail.com>
# Contributor : cyberdune <cyberdune@gmail.com>
pkgname=octave
pkgver=3.4.3
-pkgrel=1
+pkgrel=2
pkgdesc="A high-level language, primarily intended for numerical computations."
arch=('i686' 'x86_64')
url="http://www.octave.org"
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index da0430b2d..7c961ddaa 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148876 2012-02-05 11:53:48Z ibiru $
+# $Id: PKGBUILD 149966 2012-02-11 23:31:22Z allan $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -23,7 +23,7 @@ pkgname=('php'
'php-xsl')
pkgver=5.3.10
_suhosinver=5.3.9-0.9.10
-pkgrel=2
+pkgrel=4
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -35,7 +35,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
"http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
"http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
- 'logrotate.d.php-fpm')
+ 'logrotate.d.php-fpm' 'pcre_info.patch')
md5sums=('816259e5ca7d0a7e943e56a3bb32b17f'
'c099b3d7eac95018ababd41ded7f3066'
'c15d18f846be1d69144a5d0056ee6506'
@@ -43,7 +43,8 @@ md5sums=('816259e5ca7d0a7e943e56a3bb32b17f'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
'b01be5f816988fcee7e78225836e5e27'
'740ec5fe2ecfd9d7febd4081c90ec65b'
- '07c4e412909ac65a44ec90e7a2c4bade')
+ '07c4e412909ac65a44ec90e7a2c4bade'
+ '8d3806bbb19e390f9b32ccf21611d937')
build() {
phpconfig="--srcdir=../${pkgbase}-${pkgver} \
@@ -136,6 +137,8 @@ build() {
cd ${srcdir}/${pkgbase}-${pkgver}
+ patch -p1 -i ${srcdir}/pcre_info.patch
+
# apply suhosin patch
patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
diff --git a/extra/php/pcre_info.patch b/extra/php/pcre_info.patch
new file mode 100644
index 000000000..e6d10df06
--- /dev/null
+++ b/extra/php/pcre_info.patch
@@ -0,0 +1,43 @@
+--- php-5.3.10/ext/pcre/php_pcre.c 2012-01-01 14:15:04.000000000 +0100
++++ php-5.3.10/ext/pcre/php_pcre.c 2012-02-06 13:31:36.198935107 +0100
+@@ -241,6 +241,7 @@
+ char *pattern;
+ int do_study = 0;
+ int poptions = 0;
++ int count = 0;
+ unsigned const char *tables = NULL;
+ #if HAVE_SETLOCALE
+ char *locale = setlocale(LC_CTYPE, NULL);
+@@ -252,10 +252,10 @@
+ back the compiled pattern, otherwise go on and compile it. */
+ if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
+ /*
+- * We use a quick pcre_info() check to see whether cache is corrupted, and if it
++ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
+ * is, we flush it and compile the pattern from scratch.
+ */
+- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
++ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
+ zend_hash_clean(&PCRE_G(pcre_cache));
+ } else {
+ #if HAVE_SETLOCALE
+--- php-5.3.10/ext/pcre/php_pcre.def 2009-01-11 14:59:00.000000000 +0100
++++ php-5.3.10/ext/pcre/php_pcre.def 2012-02-06 13:31:47.775299315 +0100
+@@ -4,7 +4,6 @@
+ php_pcre_exec
+ php_pcre_get_substring
+ php_pcre_get_substring_list
+-php_pcre_info
+ php_pcre_maketables
+ php_pcre_study
+ php_pcre_version
+--- php-5.3.10/main/php_compat.h 2012-01-01 14:15:04.000000000 +0100
++++ php-5.3.10/main/php_compat.h 2012-02-06 13:26:59.272834580 +0100
+@@ -34,7 +34,6 @@
+ #define pcre_exec php_pcre_exec
+ #define pcre_get_substring php_pcre_get_substring
+ #define pcre_get_substring_list php_pcre_get_substring_list
+-#define pcre_info php_pcre_info
+ #define pcre_maketables php_pcre_maketables
+ #define pcre_study php_pcre_study
+ #define pcre_version php_pcre_version
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 2a21d88ce..c2fc6fceb 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148446 2012-02-01 03:47:09Z bisson $
+# $Id: PKGBUILD 149968 2012-02-11 23:31:26Z allan $
# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
# Contributor: Paul Mattal <paul@archlinux.org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=postfix
pkgver=2.9.0
-pkgrel=1
+pkgrel=2
pkgdesc='Fast, easy to administer, secure mail server'
url='http://www.postfix.org/'
license=('custom')
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index afba29ff2..852af0156 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 138832 2011-09-28 19:15:53Z angvp $
+# $Id: PKGBUILD 149915 2012-02-11 20:09:00Z ibiru $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=rsync
pkgver=3.0.9
-pkgrel=1
+pkgrel=2
pkgdesc="A file transfer program to keep remote files in sync"
arch=('i686' 'x86_64')
url="http://samba.anu.edu.au/rsync/"
@@ -13,7 +13,7 @@ license=('GPL3')
depends=('acl')
backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
changelog=ChangeLog
-source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \
+source=(http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz \
rsyncd.conf rsyncd rsync.xinetd)
md5sums=('5ee72266fe2c1822333c407e1761b92b'
'4395c0591638349b1a7aeaaa4da1f03a'
@@ -25,17 +25,18 @@ sha1sums=('c64c8341984aea647506eb504496999fd968ddfc'
'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./prepare-source
+ cd "$srcdir/$pkgname-$pkgver"
+ ./prepare-source
./configure --prefix=/usr --with-included-popt \
- --enable-acl-support --enable-xattr-support
- make
+ --enable-acl-support --enable-xattr-support
+ make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -Dm755 ../rsyncd ${pkgdir}/etc/rc.d/rsyncd
- install -Dm644 ../rsyncd.conf ${pkgdir}/etc/rsyncd.conf
- install -Dm644 ../rsync.xinetd ${pkgdir}/etc/xinetd.d/rsync
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -Dm755 ../rsyncd "$pkgdir/etc/rc.d/rsyncd"
+ install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf"
+ install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync"
+ install -Dm755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync"
}
diff --git a/extra/slang/PKGBUILD b/extra/slang/PKGBUILD
index 6905293b6..2043a8d95 100644
--- a/extra/slang/PKGBUILD
+++ b/extra/slang/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120537 2011-04-25 07:37:13Z remy $
+# $Id: PKGBUILD 149970 2012-02-11 23:31:28Z allan $
# Maintainer: Eric Belanger <eric@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=slang
pkgver=2.2.4
-pkgrel=1
+pkgrel=2
pkgdesc="S-Lang is a powerful interpreted language"
arch=('i686' 'x86_64')
url="http://www.jedsoft.org/slang/"
@@ -12,8 +12,9 @@ license=('GPL')
depends=('glibc' 'pcre' 'zlib')
backup=('etc/slsh.rc')
options=('!makeflags')
-source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7fcfd447e378f07dd0c0bae671fe6487')
+source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2{,.asc})
+md5sums=('7fcfd447e378f07dd0c0bae671fe6487'
+ '0e37091fe52b4ef609c3cee8eda0e101')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index f0f567729..6f83b618e 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145878 2012-01-03 17:17:44Z stephane $
+# $Id: PKGBUILD 149972 2012-02-11 23:31:30Z allan $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=swig
pkgver=2.0.4
-pkgrel=2
+pkgrel=3
pkgdesc="Generate scripting interfaces to C/C++ code"
arch=('i686' 'x86_64')
url="http://www.swig.org/"
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index ee13ccfa1..000a5136e 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143583 2011-11-26 17:25:12Z foutrelis $
+# $Id: PKGBUILD 149974 2012-02-11 23:31:34Z allan $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
pkgname=thunar
pkgver=1.2.3
-pkgrel=3
+pkgrel=4
pkgdesc="Modern file manager for Xfce"
arch=('i686' 'x86_64')
url="http://thunar.xfce.org"
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 506e911be..4f7f1b42d 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145793 2012-01-01 02:41:17Z dreisner $
+# $Id: PKGBUILD 149976 2012-02-11 23:31:36Z allan $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Douglas Soares de Andrade
@@ -6,7 +6,7 @@
pkgname=varnish
pkgver=3.0.2
-pkgrel=4
+pkgrel=5
pkgdesc="High-performance HTTP accelerator"
arch=('i686' 'x86_64')
url="http://www.varnish-cache.org/"
diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD
index 96095398d..68c8280dd 100644
--- a/extra/wpa_supplicant_gui/PKGBUILD
+++ b/extra/wpa_supplicant_gui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90602 2010-09-13 18:07:52Z thomas $
+# $Id: PKGBUILD 149922 2012-02-11 22:38:54Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=wpa_supplicant_gui
pkgver=0.7.3
-pkgrel=1
+pkgrel=2
pkgdesc="A Qt frontend to wpa_supplicant"
url="http://hostap.epitest.fi/wpa_supplicant"
arch=('i686' 'x86_64')
diff --git a/extra/xfce4-verve-plugin/PKGBUILD b/extra/xfce4-verve-plugin/PKGBUILD
index 1c1586a0e..145a22845 100644
--- a/extra/xfce4-verve-plugin/PKGBUILD
+++ b/extra/xfce4-verve-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104787 2011-01-04 22:36:49Z andyrtr $
+# $Id: PKGBUILD 149978 2012-02-11 23:31:39Z allan $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
pkgname=xfce4-verve-plugin
pkgver=1.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="command line plugin Xfce4 panel"
arch=('i686' 'x86_64')
license=('GPL2')
diff --git a/extra/xmlto/PKGBUILD b/extra/xmlto/PKGBUILD
index 1edd4ebe3..6386c18ce 100644
--- a/extra/xmlto/PKGBUILD
+++ b/extra/xmlto/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146526 2012-01-12 12:28:33Z giovanni $
+# $Id: PKGBUILD 149980 2012-02-11 23:31:41Z allan $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
@@ -6,7 +6,7 @@
pkgname=xmlto
pkgver=0.0.25
-pkgrel=1
+pkgrel=2
pkgdesc="Convert xml to many other formats"
arch=('i686' 'x86_64')
url="http://cyberelk.net/tim/software/xmlto/"
diff --git a/extra/xorg-mkfontscale/PKGBUILD b/extra/xorg-mkfontscale/PKGBUILD
index 883dc49b7..089af1e1c 100644
--- a/extra/xorg-mkfontscale/PKGBUILD
+++ b/extra/xorg-mkfontscale/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 130725 2011-07-07 22:14:26Z andyrtr $
+# $Id: PKGBUILD 149834 2012-02-11 10:04:54Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-mkfontscale
-pkgver=1.0.9
+pkgver=1.1.0
pkgrel=1
pkgdesc="Create an index of scalable font files for X"
arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc')
makedepends=('xorg-util-macros' 'xproto')
groups=('xorg-apps' 'xorg')
source=(http://xorg.freedesktop.org/archive/individual/app/mkfontscale-${pkgver}.tar.bz2)
-sha1sums=(''5a8ac438d6d6694dcf1314b74c4d9f029da4f486)
+sha1sums=('ba021369ae3b364ba083b9eb5e570e54b21fd583')
build() {
cd "${srcdir}/mkfontscale-${pkgver}"
diff --git a/extra/xorg-oclock/PKGBUILD b/extra/xorg-oclock/PKGBUILD
index 5016247f2..76c42e775 100644
--- a/extra/xorg-oclock/PKGBUILD
+++ b/extra/xorg-oclock/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: $
+# $Id: PKGBUILD 149836 2012-02-11 10:08:56Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-oclock
-pkgver=1.0.2
+pkgver=1.0.3
pkgrel=1
pkgdesc="Round X clock"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
-depends=('libx11' 'libxmu' 'libxext')
+depends=('libx11' 'libxmu' 'libxext' 'libxkbfile')
makedepends=('xorg-util-macros')
source=(http://xorg.freedesktop.org/archive/individual/app/oclock-${pkgver}.tar.bz2)
-sha1sums=('ba606d39fba6021c4db76d79751779f7b5c862e9')
+sha1sums=('1aa05864019a55610aca5471c5206858dde9a34a')
build() {
cd "${srcdir}/oclock-${pkgver}"
./configure --prefix=/usr
make
+}
+
+package() {
+ cd "${srcdir}/oclock-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xclipboard/PKGBUILD b/extra/xorg-xclipboard/PKGBUILD
index 08f506c42..03cb8ef90 100644
--- a/extra/xorg-xclipboard/PKGBUILD
+++ b/extra/xorg-xclipboard/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: $
+# $Id: PKGBUILD 149838 2012-02-11 10:11:10Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-xclipboard
-pkgver=1.1.1
+pkgver=1.1.2
pkgrel=1
pkgdesc="X clipboard manager"
arch=(i686 x86_64)
@@ -11,12 +11,16 @@ license=('custom')
depends=('libxaw' 'libxmu' 'libxt' 'libx11')
makedepends=('xorg-util-macros')
source=(http://xorg.freedesktop.org/archive/individual/app/xclipboard-${pkgver}.tar.bz2)
-sha1sums=('922ddf89acd0781156e9ccdf191a3e0c6376415a')
+sha1sums=('8dc77e1234c1c2853805124536676a4d5f7c7a3b')
build() {
cd "${srcdir}/xclipboard-${pkgver}"
./configure --prefix=/usr
make
+}
+
+package(){
+ cd "${srcdir}/xclipboard-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xclock/PKGBUILD b/extra/xorg-xclock/PKGBUILD
index db6506846..4365f99a0 100644
--- a/extra/xorg-xclock/PKGBUILD
+++ b/extra/xorg-xclock/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: $
+# $Id: PKGBUILD 149840 2012-02-11 10:13:13Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-xclock
-pkgver=1.0.5
+pkgver=1.0.6
pkgrel=1
pkgdesc="X clock"
arch=(i686 x86_64)
@@ -11,12 +11,16 @@ license=('custom')
depends=('libx11' 'libxmu' 'libxaw' 'libxrender' 'libxft' 'libxkbfile')
makedepends=('xorg-util-macros')
source=(http://xorg.freedesktop.org/archive/individual/app/xclock-${pkgver}.tar.bz2)
-sha1sums=('1651ac8961c0aa287a6a7412ee5e6d3bfc3bb3e2')
+sha1sums=('993817c9e3cc2baaaebe52b29fa2ad26e58b124d')
build() {
cd "${srcdir}/xclock-${pkgver}"
./configure --prefix=/usr
make
+}
+
+package() {
+ cd "${srcdir}/xclock-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD
index edb93716e..f4d56737d 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145242 2011-12-19 22:24:21Z jgc $
+# $Id: PKGBUILD 149821 2012-02-11 08:52:05Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xorg-xinit
-pkgver=1.3.1
-pkgrel=2
+pkgver=1.3.2
+pkgrel=1
pkgdesc="X.Org initialisation program "
arch=('i686' 'x86_64')
license=('custom')
@@ -23,7 +23,7 @@ source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
xsession
xserverrc)
options=(!emptydirs)
-md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
+md5sums=('9c0943cbd83e489ad1b05221b97efd44'
'abd072ec435ce084cf4e89c58f83d45c'
'73a597d3fb7f5b9487318ac8cfd4bedf'
'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index f34e49306..5853c1f57 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145827 2012-01-02 12:43:36Z pierre $
+# $Id: PKGBUILD 149982 2012-02-11 23:31:46Z allan $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=zsh
pkgver=4.3.15
-pkgrel=2
+pkgrel=3
pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
arch=('i686' 'x86_64')
url='http://www.zsh.org/'