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

Conflicts:
	community/collectd/PKGBUILD
	community/drivel/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/gnomesu/PKGBUILD
	community/gnuchess/PKGBUILD
	community/gphpedit/PKGBUILD
	community/gsql/PKGBUILD
	community/libmatchbox/PKGBUILD
	community/lockfile-progs/PKGBUILD
	community/opencc/PKGBUILD
	community/roxterm/PKGBUILD
	community/uriparser/PKGBUILD
	community/xcircuit/PKGBUILD
	core/bison/PKGBUILD
	core/curl/PKGBUILD
	core/expat/PKGBUILD
	core/gcc/PKGBUILD
	core/gpm/PKGBUILD
	core/m4/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	extra/alsa-lib/PKGBUILD
	extra/alsa-utils/PKGBUILD
	extra/bitlbee/PKGBUILD
	extra/chkrootkit/PKGBUILD
	extra/fakechroot/PKGBUILD
	extra/farstream/PKGBUILD
	extra/freeglut/PKGBUILD
	extra/gob2/PKGBUILD
	extra/libcdio-paranoia/PKGBUILD
	extra/liblqr/PKGBUILD
	extra/libnl1/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libwpd/PKGBUILD
	extra/xorg-server/PKGBUILD

2 files changed, 37 insertions, 17 deletions

diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD
index cc8afee2a..f8c9c8f52 100644
--- a/extra/razor/PKGBUILD
+++ b/extra/razor/PKGBUILD
@@ -1,41 +1,39 @@
-# $Id: PKGBUILD 160573 2012-06-02 10:28:53Z bluewind $
+# $Id: PKGBUILD 183164 2013-04-18 06:55:29Z eric $
 # Maintainer:
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Manolis Tzanidakis
 
 pkgname=razor
-pkgver=2.84
-pkgrel=7
+pkgver=2.85
+pkgrel=1
 pkgdesc="A distributed, collaborative, spam detection and filtering network"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://razor.sourceforge.net"
 license=('PerlArtistic')
 depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl')
 options=('!emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2")
-md5sums=('8b9a11a6ce020383c32c45d1530d77c2')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2"
+         razor-2.85-cosmetic-pv-fix.patch)
+md5sums=('014d08db40187cb1316482191566b012'
+         '850645e088b21845f4b6653623d59515')
 
-build() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
-
-  # skip install_razor_agents (we'll do the linking later)
-  # /bin/sed -i "s|install :: all pure_install doc_install install_razor_agents|install :: all pure_install doc_install|g" Makefile
+prepare() {
+  cd ${pkgname}-agents-${pkgver}
+  patch -p1 -i "$srcdir/razor-2.85-cosmetic-pv-fix.patch"
+}
 
+build() {
+  cd ${pkgname}-agents-${pkgver}
   perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
+  cd ${pkgname}-agents-${pkgver}
   make test
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
+  cd ${pkgname}-agents-${pkgver}
   make DESTDIR="${pkgdir}" install
-
-  # cd ${pkgdir}/usr/bin
-  # for i in razor-check razor-report razor-revoke razor-admin; do 
-  #  /bin/ln -sf razor-client $i; 
-  # done
 }
diff --git a/extra/razor/razor-2.85-cosmetic-pv-fix.patch b/extra/razor/razor-2.85-cosmetic-pv-fix.patch
new file mode 100644
index 000000000..c391d48fb
--- /dev/null
+++ b/extra/razor/razor-2.85-cosmetic-pv-fix.patch
@@ -0,0 +1,22 @@
+--- a/lib/Razor2/Client/Version.pm	2007-05-10 22:32:10.000000000 +0200
++++ b/lib/Razor2/Client/Version.pm	2010-03-25 11:11:36.911409707 +0100
+@@ -14,7 +14,7 @@
+ 
+ $PROTOCOL = 3;
+ 
+-$VERSION = '2.84';
++$VERSION = '2.85';
+ 
+ 1;
+ 
+--- a/META.yml	2007-05-23 20:29:34.000000000 +0200
++++ b/META.yml	2010-03-25 11:11:43.691408628 +0100
+@@ -1,7 +1,7 @@
+ # http://module-build.sourceforge.net/META-spec.html
+ #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
+ name:         razor-agents
+-version:      2.84
++version:      2.85
+ version_from: lib/Razor2/Client/Version.pm
+ installdirs:  site
+ requires: