Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/erlang/PKGBUILD
	community/esmtp/PKGBUILD
	community/gmic/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/libev/PKGBUILD
	community/libmirage/PKGBUILD
	community/libraw/PKGBUILD
	community/lilypond/PKGBUILD
	community/luajit/PKGBUILD
	community/matchbox-window-manager/PKGBUILD
	community/miniupnpc/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/oss/PKGBUILD
	community/pidgin-lwqq/PKGBUILD
	community/postgis/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/qmc2/PKGBUILD
	community/qtfm/PKGBUILD
	community/ruby-gtk3/PKGBUILD
	community/tea/PKGBUILD
	community/yacpi/PKGBUILD
	core/bridge-utils/PKGBUILD
	core/gcc/PKGBUILD
	core/libsasl/PKGBUILD
	core/lvm2/PKGBUILD
	core/net-tools/PKGBUILD
	core/ppp/PKGBUILD
	core/pptpclient/PKGBUILD
	core/sdparm/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/arora/PKGBUILD
	extra/bluez-hcidump/PKGBUILD
	extra/bluez/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-bluetooth/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gts/PKGBUILD
	extra/guile/PKGBUILD
	extra/harfbuzz/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/json-c/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/libbsd/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libhangul/PKGBUILD
	extra/libindi/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libsmbios/PKGBUILD
	extra/libspiro/PKGBUILD
	extra/libsrtp/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/libxrender/PKGBUILD
	extra/libxvmc/PKGBUILD
	extra/llvm/PKGBUILD
	extra/maxima/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/ortp/PKGBUILD
	extra/perl-dbd-sqlite/PKGBUILD
	extra/perl-yaml-syck/PKGBUILD
	extra/php/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/scim-anthy/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v86d/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/zsh/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/libretools/libretools.install
	libre/mc-libre/PKGBUILD

2 files changed, 5 insertions, 30 deletions

diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD
index a51005dbe..e142a6476 100644
--- a/core/dosfstools/PKGBUILD
+++ b/core/dosfstools/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 186902 2013-05-31 16:49:40Z tpowa $
+# $Id: PKGBUILD 188586 2013-06-16 16:11:16Z tpowa $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=dosfstools
-pkgver=3.0.17
+pkgver=3.0.20
 pkgrel=1
 pkgdesc="DOS filesystem utilities"
 arch=(i686 x86_64 'mips64el')
@@ -10,6 +10,8 @@ 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')
+md5sums=('b34dcf1d22bc1074ebdba68799fa3cad'
+         'SKIP')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
@@ -18,7 +20,5 @@ build() {
 
 package () {
    cd $srcdir/$pkgname-$pkgver
-   make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
+   make DESTDIR=$pkgdir PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DOCDIR=/usr/share/doc install
 }
-md5sums=('468b953ddc8baf66e9881d1a5eae03e2'
-         'SKIP')
diff --git a/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
deleted file mode 100644
index 44e6e86b5..000000000
--- a/core/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);