Wed Jul 31 01:58:05 PDT 2013

17 files changed, 206 insertions, 173 deletions

diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD
index 2a1042678..0a4384534 100644
--- a/extra/a2ps/PKGBUILD
+++ b/extra/a2ps/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191229 2013-07-21 22:39:59Z eric $
+# $Id: PKGBUILD 191744 2013-07-30 07:00:10Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=a2ps
 pkgver=4.14
-pkgrel=3
+pkgrel=4
 pkgdesc="An Any to PostScript filter"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/a2ps/"
@@ -14,15 +14,17 @@ backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg')
 options=('!libtool')
 install=a2ps.install
 source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz{,.sig}
-        a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch
-        a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch)
+        a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch 
+	a2ps-4.13-manpage-chmod.patch a2ps-4.14-check-mempcpy.patch 
+	a2ps-4.14-fix-stpcpy-proto.patch a2ps-texinfo5.patch)
 sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852'
           'SKIP'
           '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'
           '94e35a6ad9268161bec22a56d4cfb696d635994a'
           '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'
           '6aed29c1399e79f3914b408059610f9e7c0fc38e'
-          '58fa90134f1027e3f05aeb08212cbcc10f420738')
+          '58fa90134f1027e3f05aeb08212cbcc10f420738'
+          '81269db9dd29685b0ece2539070ced3f7a8472df')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -35,6 +37,7 @@ prepare() {
   patch -p1 -i "${srcdir}/a2ps-4.13-manpage-chmod.patch"
   patch -p1 -i "${srcdir}/a2ps-4.14-check-mempcpy.patch"
   patch -p0 -i "${srcdir}/a2ps-4.14-fix-stpcpy-proto.patch"
+  patch -p1 -i "${srcdir}/a2ps-texinfo5.patch"
 }
 
 build() {
diff --git a/extra/a2ps/a2ps-texinfo5.patch b/extra/a2ps/a2ps-texinfo5.patch
new file mode 100644
index 000000000..847de44b3
--- /dev/null
+++ b/extra/a2ps/a2ps-texinfo5.patch
@@ -0,0 +1,46 @@
+diff -Naur a2ps-4.14-orig/doc/a2ps.texi a2ps-4.14/doc/a2ps.texi
+--- a2ps-4.14-orig/doc/a2ps.texi	2013-07-30 02:27:21.950434805 -0400
++++ a2ps-4.14/doc/a2ps.texi	2013-07-30 02:29:07.286445041 -0400
+@@ -22,12 +22,12 @@
+ @c `a2ps'.  Avoid those quotes.
+ @iftex
+ @macro pack
+-@code{@value{PACKAGE}}@c
++@code{@value{PACKAGE}}
+ @end macro
+ @end iftex
+ @ifnottex
+ @macro pack
+-@value{PACKAGE}@c
++@value{PACKAGE}
+ @end macro
+ @end ifnottex
+ 
+@@ -43,11 +43,6 @@
+ @end macro
+ @end ifnottex
+ 
+-@c TeX variants
+-@macro LaTeX
+-La@TeX{}
+-@end macro
+-
+ @macro PreTeX
+ Pre@TeX{}
+ @end macro
+@@ -3965,13 +3960,13 @@
+ @itemx \end@{enumerate@}
+ @itemx \begin@{description@}
+ @itemx \end@{description@}
+-These commands are legal in @LaTeX but have no sense in @PreTeX{}.
++These commands are legal in @LaTeX{} but have no sense in @PreTeX{}.
+ Hence there are simply ignored and not printed (if immediately followed
+ by an end-of-line).
+ @end table
+ 
+ @node Differences with LaTeX
+-@subsubsection Differences with @LaTeX
++@subsubsection Differences with @LaTeX{}
+ The following symbols, inherited from the style sheet @code{Symbol}, are
+ not supported by @LaTeX{}:
+ 
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index 198d47e91..c35d5566e 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -1,18 +1,24 @@
-# $Id: PKGBUILD 183533 2013-04-22 15:40:22Z heftig $
+# $Id: PKGBUILD 191784 2013-07-30 19:02:00Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gjs
 pkgver=1.36.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Javascript Bindings for GNOME"
 arch=(i686 x86_64)
 url="http://live.gnome.org/Gjs"
 license=(GPL)
 depends=(cairo gobject-introspection 'js>=17.0.0')
 options=('!libtool')
-source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2)
-sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27')
+source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2
+        gettext-typo.patch)
+sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27'
+            'c2c3ca377d9d69511d5784599ea33d754aed776d5ceefaf384b8e303b54fd038')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../gettext-typo.patch
+}
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static
diff --git a/extra/gjs/gettext-typo.patch b/extra/gjs/gettext-typo.patch
new file mode 100644
index 000000000..9a07b9a71
--- /dev/null
+++ b/extra/gjs/gettext-typo.patch
@@ -0,0 +1,22 @@
+From 178c810b7797ff2fca0440e519ddf4dbede589a1 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Sun, 12 May 2013 16:46:19 +0000
+Subject: gettext: fix typo
+
+https://bugzilla.gnome.org/show_bug.cgi?id=700336
+---
+diff --git a/modules/gettext.js b/modules/gettext.js
+index 8f73c13..60991e1 100644
+--- a/modules/gettext.js
++++ b/modules/gettext.js
+@@ -46,7 +46,7 @@ function gettext(msgid) {
+     return GLib.dgettext(null, msgid);
+ }
+ function dgettext(domain, msgid) {
+-    return GLib.dgetext(domain, msgid);
++    return GLib.dgettext(domain, msgid);
+ }
+ function dcgettext(domain, msgid, category) {
+     return GLib.dcgettext(domain, msgid, category);
+--
+cgit v0.9.2
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 878bf27c5..61a710679 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191598 2013-07-26 15:46:23Z andyrtr $
+# $Id: PKGBUILD 191780 2013-07-30 17:27:51Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.2.3
+pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL2.1')
@@ -13,18 +13,12 @@ install=gnutls.install
 options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
 makedepends=('valgrind' 'strace' 'datefudge')
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}
-        tls_fix.diff)
-md5sums=('9dd691ad1ccdb7386029809afef6b5ea'
-         'SKIP'
-         '1bbf5bfb4e1420fd61c75e14347340fc')
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('7c0dd4f77dc70c64d2f385aeb2df4157'
+         'SKIP')
 
 build() {
   cd ${pkgname}-${pkgver}
-  
-  # fix broken TLS connections
-  patch -Np1 -i ../tls_fix.diff
-  
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
@@ -35,8 +29,7 @@ build() {
 
 check() {
   cd ${pkgname}-${pkgver}
-  #make -k check
-  make -j1 check
+  make -k check
 }
 
 package() {
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index 8e3374460..83206c8f6 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186533 2013-05-28 12:29:38Z heftig $
+# $Id: PKGBUILD 191762 2013-07-30 09:58:58Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gssdp
-pkgver=0.14.3
+pkgver=0.14.4
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk3 gtk-doc vala)
 optdepends=('gtk3: gssdp-device-sniffer')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('79dbdc5f79cc406632a783826b3dbe6acc0fbf41eb801b642bce1a02ecc3c66d')
+sha256sums=('ed93fa1555a7032fa1e2b24eeef17d20a2275ee8b1682f28ac48640d6f2112ac')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index cea16d012..021576a19 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186594 2013-05-30 00:27:58Z heftig $
+# $Id: PKGBUILD 191763 2013-07-30 10:02:50Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.20.3
+pkgver=0.20.4
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk-doc vala)
 optdepends=('python2: gupnp-binding-tool')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('ed7db7506506434d0fd272e3866d7ae985af5b9d7e9e5e120f8581ade90869f0')
+sha256sums=('27eec44d62f6f60305cd65d7a488fc128700f8345ab37cc2ab42cf052fdd5b35')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD
index b2a2c93e6..162b46ac9 100644
--- a/extra/libx11/PKGBUILD
+++ b/extra/libx11/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 187152 2013-06-04 16:06:29Z andyrtr $
+# $Id: PKGBUILD 191746 2013-07-30 07:19:33Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libx11
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
 options=('!libtool')
 license=('custom')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
-sha256sums=('53131412343ec252307fe14903deaf54c356f9414d72d49180c2091dcd7019fa')
+sha256sums=('10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892')
 
 build() {
   cd "${srcdir}/libX11-${pkgver}"
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD
index e1e86b09c..2b785b28f 100644
--- a/extra/nmap/PKGBUILD
+++ b/extra/nmap/PKGBUILD
@@ -1,20 +1,24 @@
-# $Id: PKGBUILD 188110 2013-06-10 00:00:35Z bisson $
+# $Id: PKGBUILD 191740 2013-07-30 01:18:34Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=nmap
-pkgver=6.25
-pkgrel=2
+pkgver=6.40
+pkgrel=1
 pkgdesc='Utility for network discovery and security auditing'
 url='http://nmap.org/'
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('pygtk')
-optdepends=('pygtk: zenmap')
+optdepends=('pygtk: zenmap'
+            'sudo: privilege escalation for zenmap'
+            'xterm: privilege escalation for zenmap'
+            'kdebase-runtime: privilege escalation for zenmap'
+            'gksu: privilege escalation for zenmap')
 depends=('pcre' 'openssl' 'libpcap' 'lua')
 source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('769943a1a5c10f67bf9738e26da42b3312db752f')
+sha1sums=('ee1bec1bb62045c7c1fc69ff183b2ae9b97bd0eb')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index f5174d07f..b12c6868a 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,63 +1,44 @@
-# $Id: PKGBUILD 182378 2013-04-09 18:38:44Z ioni $
+# $Id: PKGBUILD 191781 2013-07-30 17:31:51Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
+
 pkgname=nspr
-pkgver=4.9.6
-pkgrel=1
+pkgver=4.10
+pkgrel=2
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/nspr/"
 license=('MPL' 'GPL')
 depends=('glibc')
 makedepends=('zip')
-options=(!emptydirs)
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
-        nspr.pc.in)
-md5sums=('62b1e9d376d503d972f90c3c0031d879'
-         'bce1611f3117b53fc904cab549c09967')
+options=('!emptydirs')
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz)
+md5sums=('f5466def95726b3c900d8a0227bdd034')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  if [ "$CARCH" = "x86_64" ]; then
-    confflags="--enable-64bit"
+  cd $pkgname-$pkgver
+
+  if [[ $CARCH = x86_64 ]]; then
+    _confflags="--enable-64bit"
   else
-    confflags=""
+    _confflags=""
   fi
 
-  sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-      -i mozilla/nsprpub/config/rules.mk
-
-  ./mozilla/nsprpub/configure \
+  ./nspr/configure \
       --prefix=/usr \
       --libdir=/usr/lib \
       --includedir=/usr/include/nspr \
       --enable-optimize \
-      --disable-debug ${confflags}
+      --disable-debug ${_confflags}
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  NSPR_LIBS=`./config/nspr-config --libs`
-  NSPR_CFLAGS=`./config/nspr-config --cflags`
-  NSPR_VERSION=`./config/nspr-config --version`
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \
-  	-e "s,%prefix%,/usr," \
-	-e "s,%exec_prefix%,/usr/bin," \
-	-e "s,%includedir%,/usr/include/nspr," \
-	-e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
-	-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
-	-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
-  chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
-  ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc"
-
-  chmod 644 ${pkgdir}/usr/lib/*.a
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  rm -rf "${pkgdir}/usr/bin/compile-et.pl" \
-	"${pkgdir}/usr/bin/prerr.properties" \
-	"${pkgdir}/usr/share/aclocal/nspr.m4" \
-	"${pkgdir}/usr/include/nspr/md"
+  chmod 644 "$pkgdir"/usr/lib/*.a
+  ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc"
+  rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \
+         "$pkgdir/usr/include/nspr/md"
 }
diff --git a/extra/nspr/nspr.pc.in b/extra/nspr/nspr.pc.in
deleted file mode 100644
index 1d8f4a0ca..000000000
--- a/extra/nspr/nspr.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: %NSPR_VERSION%
-Libs: %FULL_NSPR_LIBS%
-Cflags: %FULL_NSPR_CFLAGS%
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index a00640517..17b28978e 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,109 +1,97 @@
-# $Id: PKGBUILD 185090 2013-05-10 21:54:30Z foutrelis $
+# $Id: PKGBUILD 191782 2013-07-30 17:31:52Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
-pkgver=3.14.3
-pkgrel=3
+pkgver=3.15.1
+pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.9.6
+_nsprver=4.10
 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
 makedepends=('perl')
-options=('!strip')
+options=('!strip' '!makeflags')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
         nss.pc.in
         nss-config.in
         ssl-renegotiate-transitional.patch
         add_spi+cacert_ca_certs.patch)
-sha1sums=('94d8781d1fa29cfbd37453dda3e9488709b82c4c'
+sha1sums=('1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0'
           'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
           'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
           '8a964a744ba098711b80c0d279a2993524e8eb92'
           'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
+prepare() {
+  cd $pkgname-$pkgver
+
   # Add CAcert and spi-inc.org CA certificates.
   # See http://wiki.cacert.org/NSSLib for how to generate
-  patch -Np0 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
+  patch -Np1 -i ../add_spi+cacert_ca_certs.patch
 
   # Adds transitional SSL renegotiate support - patch from Debian
-  patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
+  patch -Np3 -i ../ssl-renegotiate-transitional.patch
 
   # Respect LDFLAGS
-  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
-      -i security/coreconf/rules.mk
+  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
+      -i nss/coreconf/rules.mk
+}
 
 
-  # see https://bugzilla.mozilla.org/show_bug.cgi?id=683266 - this step can be dropped now
-  # CaCert Wiki page should be updated to reflect these changes how to add the certificates
-  # for now the first patch should still do it
-  
-  # Generate certdata.c from certdata.txt
-  #  cd security/nss/lib/ckfw/builtins
-  #  make generate
+build() {
+  cd $pkgname-$pkgver/nss
 
-  cd "${srcdir}/${pkgname}-${pkgver}"
   export BUILD_OPT=1
-  export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-  export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
   export NSS_USE_SYSTEM_SQLITE=1
   export NSS_ENABLE_ECC=1
-  export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
-  export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
+  export NSPR_INCLUDE_DIR="`nspr-config --includedir`"
+  export NSPR_LIB_DIR="`nspr-config --libdir`"
   export XCFLAGS="${CFLAGS}"
 
   [ "$CARCH" = "x86_64" ] && export USE_64=1
 
-  make -j 1 -C mozilla/security/coreconf
-  make -j 1 -C mozilla/security/dbm
-  make -j 1 -C mozilla/security/nss
+  make -C coreconf
+  make -C lib/dbm
+  make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/include/nss"
-
-  NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-
-  sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \
-  				-e "s,%prefix%,/usr,g" \
-				-e "s,%exec_prefix%,/usr/bin,g" \
-				-e "s,%includedir%,/usr/include/nss,g" \
-				-e "s,%NSPR_VERSION%,${_nsprver},g" \
-				-e "s,%NSS_VERSION%,${pkgver},g" > \
-			"${pkgdir}/usr/lib/pkgconfig/nss.pc"
-  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
-  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
-
-  sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \
-  				    -e "s,@prefix@,/usr/bin,g" \
-				    -e "s,@exec_prefix@,/usr/bin,g" \
-				    -e "s,@includedir@,/usr/include/nss,g" \
-				    -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
-				    -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
-				    -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-			    > "${pkgdir}/usr/bin/nss-config"
-  chmod 755 "${pkgdir}/usr/bin/nss-config"
-
-  for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
-              libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
-  do
-    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/"
-  done
-
-  install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/"
-  install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/"
-
-  for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do
-    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/"
-  done
-
-  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/"
+  cd $pkgname-$pkgver
+  install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig}
+
+  NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}')
+  NSS_VMINOR=$(grep '#define.*NSS_VMINOR' nss/lib/nss/nss.h | awk '{print $3}')
+  NSS_VPATCH=$(grep '#define.*NSS_VPATCH' nss/lib/nss/nss.h | awk '{print $3}')
+
+  sed ../nss.pc.in \
+    -e "s,%libdir%,/usr/lib,g" \
+    -e "s,%prefix%,/usr,g" \
+    -e "s,%exec_prefix%,/usr/bin,g" \
+    -e "s,%includedir%,/usr/include/nss,g" \
+    -e "s,%NSPR_VERSION%,${_nsprver},g" \
+    -e "s,%NSS_VERSION%,${pkgver},g" \
+    > "$pkgdir/usr/lib/pkgconfig/nss.pc"
+  ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc"
+
+  sed ../nss-config.in \
+    -e "s,@libdir@,/usr/lib,g" \
+    -e "s,@prefix@,/usr/bin,g" \
+    -e "s,@exec_prefix@,/usr/bin,g" \
+    -e "s,@includedir@,/usr/include/nss,g" \
+    -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
+    -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
+    -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+    > "$pkgdir/usr/bin/nss-config"
+  chmod 755 "$pkgdir/usr/bin/nss-config"
+
+  cd dist/*.OBJ/bin
+  install -t "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap
+
+  cd ../lib
+  install -t "$pkgdir/usr/lib" *.so
+  install -t "$pkgdir/usr/lib" -m644 libcrmf.a *.chk
+
+  cd ../../public/nss
+  install -t "$pkgdir/usr/include/nss" -m644 *.h
 }
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 2fe27ea47..8360e0763 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 189680 2013-07-04 14:55:33Z tomegun $
+# $Id: PKGBUILD 191767 2013-07-30 10:31:09Z tomegun $
 # Maintainer : Tom Gundersen <teg@jklm.no>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.80
-pkgrel=2
+pkgver=2.81
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
 license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz)
-md5sums=('2bde600d4b0a75d0bd3784550d59a8af')
+md5sums=('db1ad10ecff07150486dab2365ccb3a8')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index 1fbb3a6ed..11eaafa62 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185450 2013-05-14 10:15:54Z heftig $
+# $Id: PKGBUILD 191757 2013-07-30 09:24:26Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.8.2
+pkgver=3.8.3
 pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool')
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eda05e6abfd3d575f8b954c1e442d28639ae13b67fc285ef585b8cd78da014e8')
+sha256sums=('0d862429307d28333f17afa40cf81f6006903e1aa134a8bc430079a9db40b1c6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 8f84439a8..36a012bcd 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 187179 2013-06-04 21:40:01Z giovanni $
+# $Id: PKGBUILD 191778 2013-07-30 17:02:46Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=whois
-pkgver=5.0.25
-pkgrel=2
+pkgver=5.0.26
+pkgrel=1
 pkgdesc="The whois client by Marco d'Itri"
 arch=('i686' 'x86_64')
 url="http://www.linux.it/~md/software/"
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('libidn')
 makedepends=('perl')
 source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz")
-md5sums=('8f873c1c51592ee419b2a46b0a3c8432')
+md5sums=('236829eea77e85df2443a54815a1b41d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index f55c9b9f5..eeb25cf03 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191192 2013-07-19 14:13:15Z andyrtr $
+# $Id: PKGBUILD 191785 2013-07-30 19:12:09Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.21.12
+pkgver=2.21.13
 pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('02120a1e9297ff094e0b0ae3b2d032304da2fde2630660829bd8b333611a970b')
+sha256sums=('76e17cebf79d3c3c98af246fcfb55018aa12e2d56fe5f3b6d54b93e90837efa8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index c3a3570fb..558680093 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188202 2013-06-12 18:59:24Z lcarlier $
+# $Id: PKGBUILD 191802 2013-07-30 21:14:54Z lcarlier $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
-pkgver=1.0.8
+pkgver=1.0.9
 pkgrel=1
 pkgdesc="Open Source 2D acceleration driver for nVidia cards"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 install=$pkgname.install
 source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('9b904314b8e9c7a5800724a6a31038ed88fa3fcfd35da6f4015fc104c8283617')
+sha256sums=('b247c800e532fad1c80a5666d8ca0d4e5712064b6d7a3b030b32206a8de04482')
 
 build() {
   cd $pkgname-$pkgver