Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts: community/aircrack-ng/PKGBUILD community/fortune-mod/PKGBUILD community/hping/PKGBUILD community/iftop/PKGBUILD community/uml_utilities/PKGBUILD community/unhide/PKGBUILD extra/kismet/PKGBUILD extra/liblo/PKGBUILD extra/libxinerama/PKGBUILD extra/libxp/PKGBUILD extra/libxres/PKGBUILD extra/libxt/PKGBUILD extra/libxtst/PKGBUILD extra/libxxf86vm/PKGBUILD extra/mtr/PKGBUILD extra/transmission/PKGBUILD
author: Michał Masłowski <mtjm@mtjm.eu> 2013-06-01 10:28:14 +0200
committer: Michał Masłowski <mtjm@mtjm.eu> 2013-06-01 10:28:14 +0200
commit: 6142d9bb383134a876709765fed704815922db18 (patch)
tree: 9bbbb78a5ce1f8473dbae502634253f80a994331 /extra
parent: 0dc1411695376442c13f473499a876f085074d75 (diff)
parent: f8a7f10fa1675bee536e1fdb4672c3d84e779d1c (diff)
30 files changed, 111 insertions, 338 deletions
diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD
deleted file mode 100644
index ec298d33f..000000000
--- a/extra/dosfstools/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 186622 2013-05-30 05:56:36Z tpowa $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-pkgname=dosfstools
-pkgver=3.0.17
-pkgrel=1
-pkgdesc="DOS filesystem utilities"
-arch=(i686 x86_64 'mips64el')
-depends=('glibc')
-source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-url="http://www.daniel-baumann.ch/software/dosfstools/"
-license=('GPL2')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-   make
-}
-
-package () {
-   cd $srcdir/$pkgname-$pkgver
-   make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
-}
-md5sums=('468b953ddc8baf66e9881d1a5eae03e2'
-         'SKIP')
diff --git a/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
deleted file mode 100644
index 44e6e86b5..000000000
--- a/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- dosfstools-3.0.12/src/check.c.old	2010-01-23 10:13:17.000000000 +0100
-+++ dosfstools-3.0.12/src/check.c	2011-01-31 17:43:31.462674941 +0100
-@@ -174,7 +174,10 @@
- 	offset = fs->root_start + next_free * sizeof(DIR_ENT);
- 	memset(de, 0, sizeof(DIR_ENT));
- 	while (1) {
--	    sprintf((char *)de->name, pattern, curr_num);
-+	    char expanded[12];
-+	    sprintf(expanded, pattern, curr_num);
-+	    memcpy(de->name, expanded, 8);
-+	    memcpy(de->ext, expanded + 8, 3);
-	    for (scan = 0; scan < fs->root_entries; scan++)
- 		if (scan != next_free &&
- 		    !strncmp((const char *)root[scan].name,
---- dosfstools-3.0.12/src/fat.c
-+++ dosfstools-3.0.12/src/fat.c
-@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs)
- 	    DIR_ENT de;
- 	    loff_t offset;
- 	    files++;
--	    offset = alloc_rootdir_entry(fs, &de, "FSCK%04d");
-+	    offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC");
- 	    de.start = CT_LE_W(i & 0xffff);
-	    if (fs->fat_bits == 32)
- 		de.starthi = CT_LE_W(i >> 16);
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index 3d0b8fe7b..b0fa14489 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183349 2013-04-21 22:08:53Z heftig $
+# $Id: PKGBUILD 186906 2013-05-31 18:10:20Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine."
@@ -15,12 +15,16 @@ options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8c231bb1af8daf739524bd89aa44873f5936b8a849da49326427486ed825523f')
+sha256sums=('ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD
index e1da9bfed..e57680e55 100644
--- a/extra/gnome-nettool/PKGBUILD
+++ b/extra/gnome-nettool/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184172 2013-05-03 03:24:57Z heftig $
+# $Id: PKGBUILD 186905 2013-05-31 18:09:23Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@nospam.gmail.com>
 
 pkgname=gnome-nettool
-pkgver=3.8.0
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A Collection of GNOME3 Networking Tools."
 arch=(i686 x86_64 mips64el)
@@ -16,14 +16,11 @@ optdepends=('nmap: Port scanning'
 groups=(gnome-extra)
 url="http://www.gnome.org"
 install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        printf.patch)
-sha256sums=('3a3480dcef181684f3e37d779cfd43f9b21920412aff78501de1695faf194a28'
-            '4b06c0748650996100f710a2d7c90afc8fb75bbdd1984f243f42318d0985229e')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../printf.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-schemas-compile
   make
diff --git a/extra/gnome-nettool/printf.patch b/extra/gnome-nettool/printf.patch
deleted file mode 100644
index 89868411a..000000000
--- a/extra/gnome-nettool/printf.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -u -r gnome-nettool-3.8.0/src/info.c gnome-nettool-3.8.0-printf/src/info.c
---- gnome-nettool-3.8.0/src/info.c	2013-05-02 13:58:40.000000000 +0200
-+++ gnome-nettool-3.8.0-printf/src/info.c	2013-05-03 05:20:04.684921458 +0200
-@@ -232,13 +232,13 @@
- 	text_rx_bytes = util_legible_bytes (netload.bytes_in);
- 	text_tx_bytes = util_legible_bytes (netload.bytes_out);
- 
--	g_sprintf (rx_pkt, "%lld", netload.packets_in);
--	g_sprintf (tx_pkt, "%lld", netload.packets_out);
-+	g_sprintf (rx_pkt, "%" G_GUINT64_FORMAT, netload.packets_in);
-+	g_sprintf (tx_pkt, "%" G_GUINT64_FORMAT, netload.packets_out);
- 
--	g_sprintf (rx_error, "%lld", netload.errors_in);
--	g_sprintf (tx_error, "%lld", netload.errors_out);
-+	g_sprintf (rx_error, "%" G_GUINT64_FORMAT, netload.errors_in);
-+	g_sprintf (tx_error, "%" G_GUINT64_FORMAT, netload.errors_out);
- 
--	g_sprintf (collisions, "%lld", netload.collisions);
-+	g_sprintf (collisions, "%" G_GUINT64_FORMAT, netload.collisions);
- 	
- 	gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes);
- 	gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt);
-diff -u -r gnome-nettool-3.8.0/src/utils.c gnome-nettool-3.8.0-printf/src/utils.c
---- gnome-nettool-3.8.0/src/utils.c	2013-05-02 13:58:40.000000000 +0200
-+++ gnome-nettool-3.8.0-printf/src/utils.c	2013-05-03 05:21:45.704202804 +0200
-@@ -272,7 +272,7 @@
- 	    unit = "KiB";
- 	}
- 	
--	result = g_strdup_printf ("%lld.%lld %s", short_rx / 10,
-+	result = g_strdup_printf ("%" G_GUINT64_FORMAT ".%" G_GUINT64_FORMAT " %s", short_rx / 10,
-                                   short_rx % 10, unit);
- 	return result;	
- }
diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD
index f1de285d1..a50a798fc 100644
--- a/extra/kismet/PKGBUILD
+++ b/extra/kismet/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 171085 2012-11-16 14:51:57Z allan $
+# $Id: PKGBUILD 186877 2013-05-31 13:31:02Z andrea $
 # Maintainer:
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Juergen Hoetzel <jason@archlinux.org>
 
 pkgname=kismet
-pkgver=2011_03_R2
+pkgver=2013_03_R1b
 _realver="${pkgver//_/-}"
-pkgrel=5.1
+pkgrel=1
 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kismetwireless.net/"
 license=('GPL')
-depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl' 'libusb-compat')
+depends=('libpcap' 'pcre' 'bluez')
 optdepends=('gpsd: log coordinates of detected networks'
             'wireshark-cli: provide OUI files used to determine device manufacturer'
             'wireshark-cli: mergecap, to merge multiple capture files'
@@ -24,8 +24,8 @@ backup=('etc/kismet.conf' 'etc/kismet_drone.conf')
 install=kismet.install
 changelog=kismet.changelog
 source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz"{,.asc})
-md5sums=('8bf077e8111e6dc8c12cadefdf40aadd'
-         '500deff918ede6d0bc392a0419322833')
+md5sums=('6cdcd78baf2e15edbe8a9de3c5493f02'
+         'SKIP')
 
 build() {
     cd "${srcdir}/${pkgname}-${_realver}"
diff --git a/extra/liblo/PKGBUILD b/extra/liblo/PKGBUILD
index 5bc4b86c6..46af636cb 100644
--- a/extra/liblo/PKGBUILD
+++ b/extra/liblo/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 150414 2012-02-17 12:41:31Z allan $
+# $Id: PKGBUILD 186897 2013-05-31 15:30:05Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Pajaro
 
 pkgname=liblo
-pkgver=0.26
-pkgrel=2.2
+pkgver=0.27
+pkgrel=1
 pkgdesc="Lightweight OSC implementation: an implementation of the Open Sound Control protocol for POSIX systems"
 arch=(i686 x86_64 'mips64el')
 url="http://plugin.org.uk/liblo/"
 license=('GPL')
+depends=('glibc')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('5351de14262560e15e7f23865293b16f')
+md5sums=('e4317bab5b16003df350adfe2c181364')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/libxinerama/PKGBUILD b/extra/libxinerama/PKGBUILD
index 90e9f0e21..c5468dacf 100644
--- a/extra/libxinerama/PKGBUILD
+++ b/extra/libxinerama/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 152778 2012-03-09 16:15:35Z andyrtr $
+# $Id: PKGBUILD 186881 2013-05-31 14:01:07Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxinerama
-pkgver=1.1.2
-pkgrel=1.1
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="X11 Xinerama extension library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -13,7 +14,7 @@ depends=('libxext' 'xineramaproto')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2")
-sha1sums=('06a5b636305725ce09f6c3a4d5a15f2f188b5afd')
+sha256sums=('7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2')
 
 build() {
   cd "${srcdir}/libXinerama-${pkgver}"
diff --git a/extra/libxp/PKGBUILD b/extra/libxp/PKGBUILD
index d199ed32c..cbb27982b 100644
--- a/extra/libxp/PKGBUILD
+++ b/extra/libxp/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 151429 2012-02-26 10:49:41Z pierre $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 186883 2013-05-31 14:02:47Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxp
-pkgver=1.0.1
-pkgrel=3.1
+pkgver=1.0.2
+pkgrel=1
 pkgdesc="X11 X Print Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -13,7 +14,7 @@ makedepends=('xorg-util-macros')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libXp-${pkgver}.tar.bz2")
 license=('custom')
-sha1sums=('9c76823c7cfcb43f097963d0c930dcc4e38807a8')
+sha256sums=('952fe5b5e90abd2cf04739aef3a9b63a253cd9309ed066a82bab7ca9112fd0b5')
 
 build() {
   cd "${srcdir}/libXp-${pkgver}"
diff --git a/extra/libxres/PKGBUILD b/extra/libxres/PKGBUILD
index c252f8a3f..f7bbb1b36 100644
--- a/extra/libxres/PKGBUILD
+++ b/extra/libxres/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 152788 2012-03-09 16:26:13Z andyrtr $
+# $Id: PKGBUILD 186885 2013-05-31 14:04:26Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxres
-pkgver=1.0.6
-pkgrel=1.1
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="X11 Resource extension library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org"
@@ -12,7 +13,7 @@ depends=('libxext')
 makedepends=('resourceproto' 'damageproto' 'compositeproto' 'scrnsaverproto' 'xorg-util-macros')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2")
-sha1sums=('31a9b7d4f7a978de36c6f1c867dced29bfe7ef0f')
+sha256sums=('26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5')
 
 build() {
   cd "${srcdir}/libXres-${pkgver}"
diff --git a/extra/libxt/PKGBUILD b/extra/libxt/PKGBUILD
index 1c9bd18a0..c0b6a26ec 100644
--- a/extra/libxt/PKGBUILD
+++ b/extra/libxt/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 153609 2012-03-16 17:09:01Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 186887 2013-05-31 14:06:19Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxt
-pkgver=1.1.3
-pkgrel=1.1
+pkgver=1.1.4
+pkgrel=1
 pkgdesc="X11 toolkit intrinsics library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +13,7 @@ depends=('libsm' 'libx11')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2")
-sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a')
+sha256sums=('843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57')
 
 build() {
   cd "${srcdir}/libXt-${pkgver}"
diff --git a/extra/libxtst/PKGBUILD b/extra/libxtst/PKGBUILD
index b690e1d00..3921bb8f1 100644
--- a/extra/libxtst/PKGBUILD
+++ b/extra/libxtst/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 152793 2012-03-09 16:30:31Z andyrtr $
+# $Id: PKGBUILD 186893 2013-05-31 14:14:53Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxtst
-pkgver=1.2.1
-pkgrel=1.1
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="X11 Testing -- Resource extension library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libxext' 'libxi' 'recordproto' 'inputproto')
+depends=('libxext' 'libxi' 'recordproto' 'inputproto' 'libxfixes')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2")
-sha1sums=('44e19899f9938d3db5546e51c338d6f86d88cfe2')
+sha256sums=('ef0a7ffd577e5f1a25b1663b375679529663a1880151beaa73e9186c8309f6d9')
 
 build() {
   cd "${srcdir}/libXtst-${pkgver}"
diff --git a/extra/libxxf86dga/PKGBUILD b/extra/libxxf86dga/PKGBUILD
index 5eebaf323..2af625e53 100644
--- a/extra/libxxf86dga/PKGBUILD
+++ b/extra/libxxf86dga/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 152799 2012-03-09 16:36:28Z andyrtr $
+# $Id: PKGBUILD 186889 2013-05-31 14:07:54Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxxf86dga
-pkgver=1.1.3
+pkgver=1.1.4
 pkgrel=1
 pkgdesc="X11 Direct Graphics Access extension library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +14,7 @@ depends=('libxext' 'xf86dgaproto')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXxf86dga-${pkgver}.tar.bz2)
-sha1sums=('5af5d7d2f239b31035ae5b9d3e3718c833af8b56')
+sha256sums=('8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e')
 
 build() {
   cd "${srcdir}/libXxf86dga-${pkgver}"
diff --git a/extra/libxxf86vm/PKGBUILD b/extra/libxxf86vm/PKGBUILD
index 94dfbf043..19b6d3bb4 100644
--- a/extra/libxxf86vm/PKGBUILD
+++ b/extra/libxxf86vm/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 152801 2012-03-09 16:38:21Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 186891 2013-05-31 14:09:38Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxxf86vm
-pkgver=1.1.2
-pkgrel=1.1
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="X11 XFree86 video mode extension library"
 arch=('x86_64' 'i686' 'mips64el')
 license=('custom')
@@ -12,7 +13,7 @@ depends=('libxext' 'xf86vidmodeproto')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2)
-sha1sums=('57bbf3bb69a49f6a6dec515813394a383f85502f')
+sha256sums=('da5e86c32ee2069b9e6d820e4c2e4242d4877cb155a2b2fbf2675a1480ec37b8')
 
 build() {
   cd "${srcdir}/libXxf86vm-${pkgver}"
diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD
index fd87ef8c8..efdeaf7fc 100644
--- a/extra/metalog/PKGBUILD
+++ b/extra/metalog/PKGBUILD
@@ -1,36 +1,30 @@
-# $Id: PKGBUILD 167973 2012-10-04 13:24:41Z juergen $
+# $Id: PKGBUILD 186745 2013-05-31 01:44:03Z eric $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=metalog
 pkgver=3.0
-pkgrel=0
-pkgdesc="Metalog is a modern replacement for syslogd and klogd"
+pkgrel=2
+pkgdesc="A modern replacement for syslogd and klogd"
 url="http://metalog.sourceforge.net"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('pcre')
 provides=('logger')
-backup=('etc/metalog.conf' 'etc/conf.d/metalog')
-source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog' 'metalog.confd'  'metalog.service')
+backup=('etc/metalog.conf')
+source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog.service')
 md5sums=('6fe404e49764fa24108fd090417bacb5'
-         '9e73301a7f0be291749ee30638527cb9'
-         '86bccd5a02996921e29eff8a0394d11f'
-         'f005e6970c25bfdaf0596791e9135f98')
+         '42b8138e8868ecdf0616f73efca7b339')
 
 build() {
-  cd $srcdir/$pkgname-3
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd $pkgname-3
+  ./configure --prefix=/usr --sysconfdir=/etc --sbin=/usr/bin
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-3
-  make DESTDIR=$pkgdir install
-  install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog
-  install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog
-  install -D -m644 metalog.conf $pkgdir/etc/metalog.conf
-
-  install -d "${pkgdir}"/usr/lib/systemd/system
-  install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/
+  cd $pkgname-3
+  make DESTDIR="$pkgdir" install
+  install -D -m644 metalog.conf "$pkgdir/etc/metalog.conf"
+  install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/metalog.service
 }
diff --git a/extra/metalog/metalog b/extra/metalog/metalog
deleted file mode 100644
index 211002401..000000000
--- a/extra/metalog/metalog
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/metalog ] && . /etc/conf.d/metalog
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-if [ -f /var/run/metalog.pid ]; then
-    PID=$(cat /var/run/metalog.pid) 2>/dev/null
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting Metalog"
-    [ -z "$PID" ] && /usr/sbin/metalog -B $METALOG_OPTS 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon metalog
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Metalog"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon metalog
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}" 
-esac
-exit 0 
diff --git a/extra/metalog/metalog.confd b/extra/metalog/metalog.confd
deleted file mode 100644
index 3d76ffab3..000000000
--- a/extra/metalog/metalog.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters to be passed to metalog
-#
-
-# NOTE: Since v.0.7, metalog disables buffering by default.
-# Add '-a' if you want buffering.
-
-METALOG_OPTS=""
diff --git a/extra/metalog/metalog.service b/extra/metalog/metalog.service
index 5982c8804..82a81ea98 100644
--- a/extra/metalog/metalog.service
+++ b/extra/metalog/metalog.service
@@ -2,7 +2,7 @@
 Description=System Logger Daemon
 
 [Service]
-ExecStart=/usr/sbin/metalog
+ExecStart=/usr/bin/metalog
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index c1af1911b..dd19ab8f1 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 182370 2013-04-09 18:07:19Z ioni $
+# $Id: PKGBUILD 186756 2013-05-31 04:03:04Z foutrelis $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
 pkgver=0.84
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
@@ -16,11 +16,11 @@ md5sums=('df61096ae1b18b27f915feeb907ae48c')
 build() {
     cp -r  $pkgbase-$pkgver $pkgbase-cli
     cd mtr-cli
-    ./configure --prefix=/usr --without-gtk
+    ./configure --prefix=/usr --without-gtk --sbindir=/usr/bin
     make
 
     cd "$srcdir/$pkgbase-$pkgver"
-    ./configure --prefix=/usr
+    ./configure --prefix=/usr --sbindir=/usr/bin
     make
 }
 
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index 322688170..bf82523f9 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183540 2013-04-22 20:14:05Z andrea $
+# $Id: PKGBUILD 186908 2013-05-31 18:38:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk2
-pkgver=1.3.3
+pkgver=1.3.4
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ conflicts=('oxygen-gtk')
 replaces=('oxygen-gtk')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('37b24d69d386eca5b4382424002ed762')
+md5sums=('10a78d31de95168eae861d9c5b4be9ed')
 
 build() {
   mkdir build
diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD
index 6fe117199..23a43e728 100644
--- a/extra/oxygen-gtk3/PKGBUILD
+++ b/extra/oxygen-gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183542 2013-04-22 20:16:28Z andrea $
+# $Id: PKGBUILD 186910 2013-05-31 18:41:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=oxygen-gtk3
-pkgver=1.1.3
+pkgver=1.1.4
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('gtk3')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('63ae9752dd39a3310d20d973dd6ea247')
+md5sums=('6c6db0188d3780173af1994f34db8a71')
 
 build() {
   mkdir build
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 47a86b2d2..494ff622e 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185795 2013-05-19 09:05:59Z tpowa $
+# $Id: PKGBUILD 186914 2013-05-31 19:37:31Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,12 +6,12 @@
 
 pkgname=sane
 pkgver=1.0.23
-pkgrel=5
+pkgrel=6
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
+depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 makedepends=('texlive-latexextra')
 backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
 source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
@@ -41,6 +41,7 @@ build() {
     --enable-avahi \
     --enable-pthread \
     --disable-rpath \
+    --enable-libusb_1_0 \
     --disable-locking
   make
 }
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index 4607e6441..894ad7771 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185448 2013-05-14 10:13:02Z schiv $
+# $Id: PKGBUILD 186867 2013-05-31 11:57:47Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=13.6
+pkgver=13.7
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123'
             'timidity++' 'vorbis-tools')
 install=$pkgname.install
 source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
-md5sums=('8da59d2bfe4aa2c6ae3aa07fcc6ee6eb')
+md5sums=('220b0155bace73d4442374a837c2f5fd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD
index 439ac4a14..ca202c1bc 100644
--- a/extra/tftp-hpa/PKGBUILD
+++ b/extra/tftp-hpa/PKGBUILD
@@ -1,46 +1,42 @@
-# $Id: PKGBUILD 166932 2012-09-22 13:11:31Z thomas $
+# $Id: PKGBUILD 186770 2013-05-31 05:42:13Z eric $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Jose Javier  <jojapa@terra.es>
 pkgname=tftp-hpa
 pkgver=5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Official tftp server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/"
 license=('BSD')
 depends=('readline>=6.0.00')
 conflicts=('netkit-tftp')
-backup=('etc/conf.d/tftpd')
 source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz 
-       tftpd.rc 
-       tftpd.conf 
        LICENSE
        tftpd.service
        tftpd.socket
        tftp-hpa-0.49-fortify-strcpy-crash.patch)
 md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
-         '83fbb6f52205d95951a3c059e5351ca2'
-         'f41f484f94e91175e9183e872a2bff3b'
          '6ce21e27b6fdc1a1adf85c81e42aeecf'
-         '165b98f814f74568635a720e674d7f18'
+         'ffeac33192eac4c526657b6789cace21'
          'a23369ea33be8b4a5427ec2cfc5373dd'
          '22e8629ef19bc276a102c5d4d284c1bd')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   # fix #28103
   patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers 
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin --without-tcpwrappers 
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}" 
+  cd ${pkgname}-${pkgver}
   make INSTALLROOT="${pkgdir}" install
-  install -d "${pkgdir}/etc/rc.d"
   install -d "${pkgdir}/srv/tftp"
-  install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd"
-  install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd"
   install -D -m655 "${srcdir}/tftpd.service" "${pkgdir}/usr/lib/systemd/system/tftpd.service"
   install -D -m655 "${srcdir}/tftpd.socket" "${pkgdir}/usr/lib/systemd/system/tftpd.socket"
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/extra/tftp-hpa/tftpd.conf b/extra/tftp-hpa/tftpd.conf
deleted file mode 100644
index a4329f608..000000000
--- a/extra/tftp-hpa/tftpd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to TFTPD
-#
-TFTPD_ARGS="-l -s /srv/tftp/"
diff --git a/extra/tftp-hpa/tftpd.rc b/extra/tftp-hpa/tftpd.rc
deleted file mode 100755
index 0222d1693..000000000
--- a/extra/tftp-hpa/tftpd.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-TFTPD_ARGS=
-[ -f /etc/conf.d/tftpd ] && . /etc/conf.d/tftpd
-
-PID=$(pidof -o %PPID /usr/sbin/in.tftpd)
-case "$1" in
-  start)
-    stat_busy "Starting TFTPD"
-    [ -z "$PID" ] && /usr/sbin/in.tftpd ${TFTPD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon tftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping TFTPD"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon tftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/tftp-hpa/tftpd.service b/extra/tftp-hpa/tftpd.service
index 62562343d..293e0370b 100644
--- a/extra/tftp-hpa/tftpd.service
+++ b/extra/tftp-hpa/tftpd.service
@@ -2,7 +2,7 @@
 Description=hpa's original TFTP daemon
 
 [Service]
-ExecStart=/usr/sbin/in.tftpd -s /srv/tftp/
+ExecStart=/usr/bin/in.tftpd -s /srv/tftp/
 StandardInput=socket
 StandardOutput=inherit
 StandardError=journal
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index a95b9c42d..b01553131 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,20 +1,18 @@
-# $Id: PKGBUILD 179032 2013-03-01 18:56:31Z andrea $
+# $Id: PKGBUILD 186895 2013-05-31 15:05:32Z foutrelis $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
 pkgver=2.77
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
 license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
-        transmissiond transmissiond.conf transmission.systemd
+        transmission.systemd
         transmission.tmpfiles)
 md5sums=('60c0e77a1852656215f7102a437b2a3d'
-         '7d6186ee2a852ae3d44980f05063e194'
-         'db72b02fee139e8ab416324e6c044d76'
          '5c289c8901221a94be74665368ab5c2c'
          '23f2320361ad54373c3a4551ef634fe8')
 
@@ -30,7 +28,6 @@ build() {
 package_transmission-cli() {
   pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
   depends=('curl' 'libevent')
-  backup=('etc/conf.d/transmissiond')
   install=transmission-cli.install
 
   cd $pkgbase-$pkgver
@@ -40,8 +37,6 @@ package_transmission-cli() {
       make -C "$dir" DESTDIR="$pkgdir" install
   done
 
-  install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond"
-  install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond"
   install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf"
   install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service"
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
diff --git a/extra/transmission/transmissiond b/extra/transmission/transmissiond
deleted file mode 100644
index ea3d770f9..000000000
--- a/extra/transmission/transmissiond
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/transmissiond
-
-PID=`pidof -o %PPID /usr/bin/transmission-daemon`
-case "$1" in
-  start)
-    stat_busy "Starting Transmission Daemon"
-    [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" "${TRANS_USER:-transmission}"
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon transmissiond
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Transmission Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon transmissiond
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done
-    $0 start
-    ;;
-  reload)
-      stat_busy "Reloading config"
-      [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-          stat_fail
-      else
-          stat_done
-      fi
-      ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"
-esac
-exit 0
diff --git a/extra/transmission/transmissiond.conf b/extra/transmission/transmissiond.conf
deleted file mode 100644
index 45a9fd51d..000000000
--- a/extra/transmission/transmissiond.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# example configuration file
-
-# TRANS_USER="transmission"
-# TRANS_ARGS=""
author	Michał Masłowski <mtjm@mtjm.eu>	2013-06-01 10:28:14 +0200
committer	Michał Masłowski <mtjm@mtjm.eu>	2013-06-01 10:28:14 +0200
commit	6142d9bb383134a876709765fed704815922db18 (patch)
tree	9bbbb78a5ce1f8473dbae502634253f80a994331 /extra
parent	0dc1411695376442c13f473499a876f085074d75 (diff)
parent	f8a7f10fa1675bee536e1fdb4672c3d84e779d1c (diff)