Merge branch 'master' of vparabola:abslibre

Conflicts: java/not-working/java-bnd/PKGBUILD libre/parabola-keyring/PKGBUILD
author: Nicolás Reynolds <fauno@parabola.nu> 2013-07-03 10:33:32 -0300
committer: Nicolás Reynolds <fauno@parabola.nu> 2013-07-03 10:33:32 -0300
commit: 8647aee53c2f9f5458e57fe7ac212da40a555594 (patch)
tree: b99a8fbc859d18a244ea5ac496083e66ffaa330d /pcr
parent: 3a14409a347f3423bf2a4ab847edff625b671e20 (diff)
parent: 0a5c7083d197551290bc762f4ba90210cb733a5e (diff)
75 files changed, 1668 insertions, 851 deletions
diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD
index 1cd3cccf6..7142d6c9f 100644
--- a/pcr/amsynth/PKGBUILD
+++ b/pcr/amsynth/PKGBUILD
@@ -1,26 +1,25 @@
 # Maintainer : Guest One <theguestone at gmail dot com>
 
 pkgname=amsynth
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Analogue Modeling SYNTHesizer"
 arch=('i686' 'x86_64')
-url="http://code.google.com/p/amsynth/"
+url="http://code.google.com/p/$pkgname/"
 license=('GPL')
-depends=('gtkmm' 'jack' 'liblo')
-makedepends=('desktop-file-utils' 'dssi' 'libtool' 'ladspa')
+depends=('gtkmm' 'jack' 'liblo' 'ladspa')
+makedepends=('desktop-file-utils' 'dssi' 'libtool')
 install="$pkgname.install"
-source=("http://amsynth.googlecode.com/files/amSynth-$pkgver.tar.gz")
-md5sums=('991329e433bb8c496f9ca5158faf0bca')
+source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+md5sums=('9193d334c89996cf44e98422e03318bb')
 
 build() {
-  cd "$srcdir/amSynth-$pkgver"
-  libtoolize
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/amSynth-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
 }
diff --git a/pcr/bibletime/PKGBUILD b/pcr/bibletime/PKGBUILD
new file mode 100644
index 000000000..3a2941623
--- /dev/null
+++ b/pcr/bibletime/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: SanskritFritz (gmail)
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de>
+
+pkgname=bibletime
+pkgver=2.9.2
+pkgrel=10
+pkgdesc="Bible study tool for KDE4"
+arch=('x86_64' 'i686')
+url="http://www.bibletime.info/"
+license=('GPL2')
+depends=('sword' 'openssl' 'clucene' 'qtwebkit')
+makedepends=('cmake')
+install=$pkgname.install
+source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	CXXFLAGS+=" -fpermissive"
+
+#	rm CMakeCache.txt
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DQT_QMAKE_EXECUTABLE=qmake4 \
+		-DBT_FORCE_USE_QT4=TRUE \
+		"$srcdir/$pkgname-$pkgver"
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+sha256sums=('393c77419b0514645cf2417f52d37bdbd604f8eeb37e76355e14c38d896093c8')
diff --git a/pcr/bibletime/bibletime.install b/pcr/bibletime/bibletime.install
new file mode 100644
index 000000000..ad97d7bab
--- /dev/null
+++ b/pcr/bibletime/bibletime.install
@@ -0,0 +1,13 @@
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/chiliproject/PKGBUILD b/pcr/chiliproject/PKGBUILD
index 4f933934a..976316dc4 100644
--- a/pcr/chiliproject/PKGBUILD
+++ b/pcr/chiliproject/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=chiliproject
 pkgver=3.3.0
diff --git a/pcr/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD
index c680ac904..da085729f 100644
--- a/pcr/cinepaint-lts/PKGBUILD
+++ b/pcr/cinepaint-lts/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=cinepaint-lts
 pkgver=1.0
diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD
index 1a81e15d4..2c45a3b0c 100644
--- a/pcr/cluster-glue/PKGBUILD
+++ b/pcr/cluster-glue/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname1=${pkgname::7}
 _pkgname2=${pkgname:8}
 _pkgname=${_pkgname1^}_${_pkgname2^}
 pkgver=1.0.11
-pkgrel=12
+pkgrel=14
 pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)'
 arch=(
   i686
@@ -31,14 +31,13 @@ depends=(
   openhpi
   openipmi
   openssh
-  python
+  python2
   util-linux
-  #vacm !!Is VA-Cluster Manager abandonware? - http://vacm.sourceforge.net/ - ver 2.0.5a - 2001/10/03!!
 )
 optdepends=net-tools
 makedepends=(
   help2man
-  #libxslt
+  libxslt
   lynx
   net-tools
   openssh
@@ -50,8 +49,20 @@ provides=(ha-$_pkgname2)
 conflicts=ha-$_pkgname2
 replaces=ha-$_pkgname2
 install=$pkgname.install
-source=http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2
-sha512sums=35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
+source=(
+  http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2
+  ha-log.service
+  fixing-path.sed
+  replace-linux_os-to-gnulinux_os-term.sed
+  replace-opensource-to-free-term.sed
+)
+sha512sums=(
+  35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
+  bb5bc5c5a9347302be583c43b100c0c3760ec4dcc3348a9f9708d5b2c58ec02dd5782c5ac9dcb86223258493ad3fba8ddd8dc5670390f0f602c34869b26bee6d
+  ce58a2af9f32265f12cc4984e9ae7f285fdb7737813ecccc0780015d048938d9dd79278635eb1cc6833f12f37a8c43211fec17411780220cf38fc44b91ecc076
+  e59386aee4db5857fa131798327aa449a5efcd7d50c3ab45dadfa0becc31698a62367ce83b85ca739bdebaad4a9daf96d02c42673a4e26294ec0fa67323fdb5b
+  c82bd919d1cd02afccd10aea3e015f289ac97e387a1485097d681f9161a00c64859a5dce0ed36b98ad6a340264c2d854dcc83e3248e12828795b73c6ff67ef5b
+)
 
 prepare() {
   export _CLUSTER_USER=hacluster
@@ -85,131 +96,58 @@ prepare() {
          ' $(grep -rlI INCLUDES | grep Makefile.am)
 
   # fixing path
-  sed -i 's|bin/sh|usr/bin/bash|;
-         ' $(grep -rlI bin/sh)
-  sed -i 's| /bin| /usr/bin|;
-         ' $(grep -rlI ' /bin')
-  sed -i 's| /sbin| /usr/bin|;
-         ' $(grep -rlI ' /sbin')
-  sed -i 's|usr/sbin|usr/bin|;
-         ' $(grep -rlI usr/sbin)
-  #sed -i 's|/lib64|/lib|;
-  #       ' $(grep -rlI /lib64)
-  #sed -i 's|usr/libexec|usr/lib|;
-  #       ' $(grep -rlI usr/libexec)
-  sed -i 's|var/lock|run/lock|;
-         ' $(grep -rlI var/lock)
-  sed -i 's|var/run|run|;
-         ' $(grep -rlI var/run)
+  sed -i -f $srcdir/fixing-path.sed\
+    $(grep -rlI /bin)\
+    $(grep -rlI /sbin)\
+    $(grep -rlI /lib)\
+    $(grep -rlI /var)
 
-  # remove Open Source term
-  sed -i 's|Open Source / ||;
-          s|open source / ||;
-          s|Open Source|Free|;
-          s|open source|free|;
-          s|Free Software Development Lab|Open Source Development Lab|;
-         ' $(grep -rilI 'open source')
-  sed -i 's|OpenSource / ||;
-          s|opensource / ||;
-          s|OpenSource|Free|;
-          s|opensource|free|;
-          s|freesoftware.org|opensource.org|;
-          s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
-          s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
-          s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
-         ' $(grep -rilI opensource)
+  # fixing python2 path
+  sed -i 's|bin/env python|bin/env python2|g;
+          s|bin/python|bin/python2|g;
+         ' $(grep -rlI 'bin/env python')\
+           $(grep -rlI bin/python)
 
-  # remove Linux term
-  sed -i 's|Linux,|GNU/Linux,|;
-          s|Linux and|GNU/Linux and|;
-          s|Linux distro|GNU/Linux distro|;
-          s|Linux distribution|GNU/Linux distribution|;
-          s|Linux machine|GNU/Linux machine|;
-          s|Linux Only|GNU/Linux Only|;
-          s|Linux only|GNU/Linux only|;
-          s|Linux operating|GNU/Linux operating|;
-          s|Linux OS|GNU/Linux OS|;
-          s|Linux platform|GNU/Linux platform|;
-          s|Linux software|GNU/Linux software|;
-          s|Linux specific|GNU/Linux specific|;
-          s|Linux system|GNU/Linux system|;
-          s|Linux will|GNU/Linux will|;
-          s|# Linux$|# GNU/Linux|;
-          s|# Linux.$|# GNU/Linux.|;
-          s|* Linux$|* GNU/Linux|;
-          s|* Linux.$|* GNU/Linux.|;
-          s|// Linux$|// GNU/Linux|;
-          s|// Linux.$|// GNU/Linux.|;
-          s|, Linux|, GNU/Linux|;
-          s|As Linux|As GNU/Linux|;
-          s|as Linux|as GNU/Linux|;
-          s|And Linux|And GNU/Linux|;
-          s|and Linux|and GNU/Linux|;
-          s|Be Linux|Be GNU/Linux|;
-          s|be Linux|be GNU/Linux|;
-          s|Because Linux|Because GNU/Linux|;
-          s|because Linux|because GNU/Linux|;
-          s|e.g. Linux|e.g. GNU/Linux|;
-          s|For Linux|For GNU/Linux|;
-          s|for Linux|for GNU/Linux|;
-          s|In Linux|In GNU/Linux|;
-          s|in Linux|in GNU/Linux|;
-          s|Like Linux|Like GNU/Linux|;
-          s|like Linux|like GNU/Linux|;
-          s|non-Linux|non GNU/Linux|;
-          s|Of Linux|Of GNU/Linux|;
-          s|of Linux|of GNU/Linux|;
-          s|On Linux|On GNU/Linux|;
-          s|on Linux|on GNU/Linux|;
-          s|OS type: Linux|OS type: GNU/Linux|;
-          s|Other Linux|Other GNU/Linux|;
-          s|other Linux|other GNU/Linux|;
-          s|The Linux|The GNU/Linux|;
-          s|the Linux|the GNU/Linux|;
-          s|Typically Linux|Typically GNU/Linux|;
-          s|typically Linux|typically GNU/Linux|;
-          s|To Linux|To GNU/Linux|;
-          s|to Linux|to GNU/Linux|;
-          s|Under Linux|Under GNU/Linux|;
-          s|under Linux|under GNU/Linux|;
-          s|ArchGNU/Linux|ArchLinux|;
-          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
-          s|GNU/GNU|GNU|;
-          s|GNU/Linux device|Linux device|;
-          s|GNU/Linux Director Daemon|Linux Director Daemon|;
-          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
-          s|GNU/Linux kernel|Linux kernel|;
-          s|GNU/Linux specific kernel|Linux specific kernel|;
-          s|GNU/Linux Standard Base|Linux Standard Base|;
-          s|GNU/Linux sysfs|Linux sysfs|;
-          s|GNU/Linux Virtual Server|Linux Virtual Server|;
-          s|GNU/Linux Watchdog|Linux Watchdog|;
-          s|GNU/Linux watchdog|Linux watchdog|;
-          s|GNU/LinuxHA|LinuxHA|;
-          s|GNU/Linux-HA|Linux-HA|;
-          s|GNU/LinuxSCSI|LinuxSCSI|;
-          s|HA GNU/Linux|HA Linux|;
-          s|High-Availability GNU/Linux|High-Availability Linux|;
-          s|MkGNU/Linux|MkLinux|;
-          s|SEGNU/Linux|SELinux|;
-          s|VA GNU/Linux Cluster|VA Linux Cluster|;
-         ' $(grep -rlI Linux)
-}
+  # remove Linux (OS) term to GNU/Linux (OS) term
+  sed -i -f $srcdir/replace-linux_os-to-gnulinux_os-term.sed\
+    $(grep -rlI Linux)
+
+  # replace Open Source term to Free term
+  sed -i -f $srcdir/replace-opensource-to-free-term.sed\
+    $(grep -rilI 'open.\{0,1\}source')
+#}
 
-build() {
+#build() { # disabled, due that is needed internet for generating man pages with libxslt.
   cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver
   setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
+  setarch $CARCH ./configure\
+    --sysconfdir=/etc\
+    --prefix=/usr\
+    --exec-prefix=/usr\
+    --bindir=/usr/bin\
+    --sbindir=/usr/bin\
+    --includedir=/usr/include\
+    --oldincludedir=/usr/include\
+    --libdir=/usr/lib\
+    --libexecdir=/usr/lib\
+    --datarootdir=/usr/share\
+    --datadir=/usr/share\
+    --docdir=/usr/share/doc/$pkgname\
+    --dvidir=/usr/share/doc/$pkgname\
+    --htmldir=/usr/share/doc/$pkgname\
+    --pdfdir=/usr/share/doc/$pkgname\
+    --psdir=/usr/share/doc/$pkgname\
+    --infodir=/usr/share/info\
+    --localedir=/usr/share/locale\
+    --mandir=/usr/share/man\
+    --localstatedir=/var\
     --disable-ansi\
     --disable-fatal-warnings\
     --disable-static\
     --enable-doc\
     --enable-libnet\
+    --enable-shared\
     --enable-upstart\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sbindir=/usr/bin\
-    --sysconfdir=/etc\
     --with-daemon-group=haclient\
     --with-daemon-user=hacluster\
     --with-ocf-root=/usr/lib/ocf
@@ -220,19 +158,8 @@ package() {
   cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver
   setarch $CARCH make DESTDIR=$pkgdir install
 
-  rm $pkgdir/etc/rc.d/logd && rmdir $pkgdir/etc{/rc.d,}
-
   install -d $pkgdir/usr/lib/systemd/system
-  echo '[Unit]'                                   >  $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'Description=Startup script logd service'  >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo ''                                         >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo '[Service]'                                >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'Type=forking'                             >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'ExecStart=/usr/lib/heartbeat/ha_logd'     >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo ''                                         >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo '[Install]'                                >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'WantedBy=multi-user.target'               >> $pkgdir/usr/lib/systemd/system/ha_log.service
+  install -m644 $srcdir/ha-log.service $pkgdir/usr/lib/systemd/system
 
   msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:'
   echo -e "# userdel $_CLUSTER_USER"
diff --git a/pcr/cluster-glue/fixing-path.sed b/pcr/cluster-glue/fixing-path.sed
new file mode 100644
index 000000000..43ef66253
--- /dev/null
+++ b/pcr/cluster-glue/fixing-path.sed
@@ -0,0 +1,29 @@
+s|/bin/sh|/bin/bash|g;
+s| /bin| /usr/bin|g;
+s|=/bin|=/usr/bin|g;
+s|!/bin|!/usr/bin|g;
+s|:/bin|:/usr/bin|g;
+s|#/bin|#/usr/bin|g;
+s| /sbin| /usr/bin|g;
+s|=/sbin|=/usr/bin|g;
+s|!/sbin|!/usr/bin|g;
+s|:/sbin|:/usr/bin|g;
+s|#/sbin|#/usr/bin|g;
+s| /usr/sbin| /usr/bin|g;
+s|=/usr/sbin|=/usr/bin|g;
+s|!/usr/sbin|!/usr/bin|g;
+s|:/usr/sbin|:/usr/bin|g;
+s|#/usr/sbin|#/usr/bin|g;
+s|:/usr/bin:/usr/bin|:/usr/bin|g;
+s|lib64|lib|g;
+s| /lib| /usr/lib|g;
+s|=/lib|=/usr/lib|g;
+s|#/lib|#/usr/lib|g;
+s| /usr/libexec| /usr/lib|g;
+s|=/usr/libexec|=/usr/lib|g;
+s|#/usr/libexec|#/usr/lib|g;
+s| /usr/var| /var|g;
+s|=/usr/var|=/var|g;
+s|#/usr/var|#/var|g;
+s|/var/lock|/run/lock|g;
+s|/var/run|/run|g;
diff --git a/pcr/cluster-glue/ha-log.service b/pcr/cluster-glue/ha-log.service
new file mode 100644
index 000000000..5115298d7
--- /dev/null
+++ b/pcr/cluster-glue/ha-log.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Non-blocking logging daemon.
+Requires=network.target remote-fs.target
+Before=heartbeat.service openais.service corosync.service
+
+[Service]
+Type=forking
+ExecStart=/usr/lib/heartbeat/ha_logd -d >/dev/null 2>&1
+ExecStop=/usr/lib/heartbeat/ha_logd -k >/dev/null 2>&1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed b/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed
new file mode 100644
index 000000000..2c9801c11
--- /dev/null
+++ b/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed
@@ -0,0 +1,73 @@
+s|Linux,|GNU/Linux,|g;
+s|Linux and|GNU/Linux and|g;
+s|Linux distro|GNU/Linux distro|g;
+s|Linux distribution|GNU/Linux distribution|g;
+s|Linux machine|GNU/Linux machine|g;
+s|Linux Only|GNU/Linux Only|g;
+s|Linux only|GNU/Linux only|g;
+s|Linux operating|GNU/Linux operating|g;
+s|Linux OS|GNU/Linux OS|g;
+s|Linux platform|GNU/Linux platform|g;
+s|Linux software|GNU/Linux software|g;
+s|Linux specific|GNU/Linux specific|g;
+s|Linux system|GNU/Linux system|g;
+s|Linux will|GNU/Linux will|g;
+s|# Linux$|# GNU/Linux|g;
+s|# Linux[.]$|# GNU/Linux.|g;
+s|* Linux$|* GNU/Linux|g;
+s|* Linux[.]$|* GNU/Linux.|g;
+s|// Linux$|// GNU/Linux|g;
+s|// Linux[.]$|// GNU/Linux.|g;
+s|, Linux|, GNU/Linux|g;
+s|As Linux|As GNU/Linux|g;
+s|as Linux|as GNU/Linux|g;
+s|And Linux|And GNU/Linux|g;
+s|and Linux|and GNU/Linux|g;
+s|Be Linux|Be GNU/Linux|g;
+s|be Linux|be GNU/Linux|g;
+s|Because Linux|Because GNU/Linux|g;
+s|because Linux|because GNU/Linux|g;
+s|e[.]g[.] Linux|e.g. GNU/Linux|g;
+s|For Linux|For GNU/Linux|g;
+s|for Linux|for GNU/Linux|g;
+s|In Linux|In GNU/Linux|g;
+s|in Linux|in GNU/Linux|g;
+s|Like Linux|Like GNU/Linux|g;
+s|like Linux|like GNU/Linux|g;
+s|non-Linux|non GNU/Linux|g;
+s|Of Linux|Of GNU/Linux|g;
+s|of Linux|of GNU/Linux|g;
+s|On Linux|On GNU/Linux|g;
+s|on Linux|on GNU/Linux|g;
+s|OS type: Linux|OS type: GNU/Linux|g;
+s|Other Linux|Other GNU/Linux|g;
+s|other Linux|other GNU/Linux|g;
+s|The Linux|The GNU/Linux|g;
+s|the Linux|the GNU/Linux|g;
+s|Typically Linux|Typically GNU/Linux|g;
+s|typically Linux|typically GNU/Linux|g;
+s|To Linux|To GNU/Linux|g;
+s|to Linux|to GNU/Linux|g;
+s|Under Linux|Under GNU/Linux|g;
+s|under Linux|under GNU/Linux|g;
+s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|g;
+s|GNU/GNU|GNU|g;
+s|ArchGNU/Linux|ArchLinux|g;
+s|MkGNU/Linux|MkLinux|g;
+s|GNU/Linux device|Linux device|g;
+s|GNU/Linux Director Daemon|Linux Director Daemon|g;
+s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|g;
+s|GNU/Linux kernel|Linux kernel|g;
+s|GNU/Linux specific kernel|Linux specific kernel|g;
+s|GNU/Linux Standard Base|Linux Standard Base|g;
+s|GNU/Linux sysfs|Linux sysfs|g;
+s|GNU/Linux Virtual Server|Linux Virtual Server|g;
+s|GNU/Linux Watchdog|Linux Watchdog|g;
+s|GNU/Linux watchdog|Linux watchdog|g;
+s|GNU/LinuxHA|LinuxHA|g;
+s|GNU/Linux-HA|Linux-HA|g;
+s|GNU/LinuxSCSI|LinuxSCSI|g;
+s|HA GNU/Linux|HA Linux|g;
+s|High-Availability GNU/Linux|High-Availability Linux|g;
+s|SEGNU/Linux|SELinux|g;
+s|VA GNU/Linux Cluster|VA Linux Cluster|g;
diff --git a/pcr/cluster-glue/replace-opensource-to-free-term.sed b/pcr/cluster-glue/replace-opensource-to-free-term.sed
new file mode 100644
index 000000000..c086bb91e
--- /dev/null
+++ b/pcr/cluster-glue/replace-opensource-to-free-term.sed
@@ -0,0 +1,19 @@
+s|Open Source Definition (Version [0-9].[0-9])|Free Software Definition|g;
+s|Open Source Definition|Free Software Definition|g;
+s|Open Source Initiative|Free Software Foundation|g;
+s|OSI Certifi|FSF Certif|g;
+s|OSI certifi|FSF certif|g;
+s|opensource[.]org/osd-annotated|gnu.org/philosophy/free-sw.html|g;
+s|opensource[.]org/osd|gnu.org/philosophy/free-sw.html|g;
+s|opensource[.]org/|gnu.org/philosophy/free-sw.html|g;
+s|[ _-].\{1,3\}[ _-][oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE]||g;
+s|[oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE][ _-].\{1,3\}[ _-]||g;
+s|OPEN.\{0,1\}SOURCE|FREE|g;
+s|Open.\{0,1\}[sS]ource|Free|g;
+s|open.\{0,1\}[sS]ource|free|g;
+s|Free Development Lab|Open Source Development Lab|g;
+s|free[.]org|opensource.org|g;
+s|gnu[.]org/philosophy/free-sw[.]htmllicenses|opensource.org/licenses|g;
+s|oss[.]software[.]ibm[.]com/developerworks/free|oss.software.ibm.com/developerworks/opensource|g;
+s|oberhumer[.]com/free|oberhumer.com/opensource|g;
+s|free@google[.]com|opensource@google.com|g;
diff --git a/pcr/clusterit/PKGBUILD b/pcr/clusterit/PKGBUILD
index c325a003b..59ef12be3 100644
--- a/pcr/clusterit/PKGBUILD
+++ b/pcr/clusterit/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=clusterit
 pkgver=2.5
diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD
index ebcc90448..1b42c921c 100644
--- a/pcr/collada-dom/PKGBUILD
+++ b/pcr/collada-dom/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=collada-dom
 pkgver=2.4.0
diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD
index e176cb112..a24064722 100644
--- a/pcr/corosync/PKGBUILD
+++ b/pcr/corosync/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=corosync
 _pkgflag=lts
 pkgver=2.3.0
-pkgrel=2
+pkgrel=4
 pkgdesc='Cluster engine for nodal communication systems with additional features for implementing high availability within applications'
 arch=(
   i686
@@ -13,21 +13,23 @@ arch=(
 url=http://www.$pkgname.org
 license=BSD
 depends=(
+  dbus
   libqb
   libstatgrab
   net-snmp
   nss
 )
-makedepends=doxygen
+optdepends='augeas: for config files'
+makedepends=(
+  augeas
+  doxygen
+  graphviz
+)
 conflicts=$pkgname-$_pkgflag
 options=(!libtool)
 source=http://$pkgname.org/download/$pkgname-$pkgver.tar.gz
 sha512sums=cd2ff5182f0d4827a10d50a211aa073e3d544bf7b98f9b0c834243c0d2cd5446d7950021cb1a21fc16f4951c8b2acf4b75c0b0c72d815b7d67dcba71623d2e51
 
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-}
-
 build() {
   cd $srcdir/$pkgname-$pkgver
   setarch $CARCH ./configure --prefix=/usr\
@@ -49,6 +51,7 @@ build() {
     --enable-xmlconf\
     --libdir=/usr/lib\
     --localstatedir=/var\
+    --sbindir=/usr/bin\
     --sysconfdir=/etc\
     --with-initddir=/etc/rc.d\
     --with-systemddir=/usr/lib/systemd/system
diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD
index e46a7d0b1..d5a45b5b1 100644
--- a/pcr/debootstrap/PKGBUILD
+++ b/pcr/debootstrap/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id$
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=debootstrap
-pkgver=1.0.48
-pkgrel=1
+pkgver=1.0.52
+pkgrel=3
 pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt"
 arch=('any')
 license=('GPL')
@@ -13,15 +12,20 @@ source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver
         'metad'
         'trisquel')
 install="debootstrap.install"
-md5sums=('f75ae43204ed273c7a95c12a5a2f715a'
+md5sums=('97ac467bf63cf066f52d0dd7fcf77e9a'
          '4425300ca68d60fb60a6d699e153a519'
          'b020aa8426e70a6024c8e76312c17d78')
 
 package(){
-  tar -xzf "$srcdir/data.tar.gz" -C "$pkgdir/"
-
+  tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
+  # move the executables to /usr/bin
+  mkdir -p ${pkgdir}/usr/bin
+  mv "${pkgdir}/usr/sbin"/* "${pkgdir}/usr/bin/"
+  rmdir "${pkgdir}/usr/sbin"
+  # patch the path to use gNewSense or Trisquel defaults (prevents error in chrooted environment) 
+  sed -i 's|export PATH|export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jre/bin:/usr/bin/vendor_perl:/usr/bin/core_perl"|' ${pkgdir}/usr/bin/debootstrap
   # doesn't work with gpg 2.x, patch to point to gpg1v
-  sed 's/gpgv/gpg1v/g;' -i "$pkgdir/usr/sbin/debootstrap" "$pkgdir/usr/share/debootstrap/functions"
+  sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
 
   # add gNewSense script
   install -m644  metad        "$pkgdir/usr/share/debootstrap/scripts"
diff --git a/pcr/ffmpeg-static/PKGBUILD b/pcr/ffmpeg-static/PKGBUILD
deleted file mode 100644
index 1e5634fb6..000000000
--- a/pcr/ffmpeg-static/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
-
-pkgname=ffmpeg-static
-pkgver=1.0
-pkgrel=2
-epoch=1
-pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library'
-arch=(i686 x86_64 mips64el)
-url=http://${pkgname%-static}.org/
-license=(GPL)
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib)
-makedepends=(yasm libvdpau)
-provides=(${pkgname%-static})
-conflicts=(${pkgname%-static})
-source=(http://${pkgname%-static}.org/releases/${pkgname%-static}-$pkgver.tar.bz2)
-md5sums=(3ed526cea20c1bffb5a37f7730f710bd)
-
-build() {
-  cd ${pkgname%-static}-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-libv4l2 \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --enable-static
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd ${pkgname%-static}-$pkgver
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD
index f5a900b88..efa005071 100644
--- a/pcr/ganglia/PKGBUILD
+++ b/pcr/ganglia/PKGBUILD
@@ -1,70 +1,78 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=ganglia
 pkgver=3.6.0
-pkgrel=2
-pkgdesc="A scalable distributed monitoring system for high-performance computing systems such as clusters and Grids."
-arch=('i686' 'x86_64')
-url="http://ganglia.sourceforge.net/"
-license=('BSD')
-depends=('apr' 'confuse' 'expat' 'pcre' 'python2' 'rrdtool')
-options=('!libtool')
-optdepends=('ganglia-web: Web frontend')
-install='ganglia.install'
-backup=('etc/ganglia/gmond.conf'
-        'etc/ganglia/gmetad.conf')
-source=("http://downloads.sourceforge.net/ganglia/$pkgname-$pkgver.tar.gz" 
-        'gmond.rc'
-        'gmetad.rc'
-        'gmond.service'
-        'gmetad.service'
-        'ganglia.install'
-        'uid.patch')
-md5sums=('05926bb18c22af508a3718a90b2e9a2c'
-         '12b2f85361754eaf6fc5129cccec7034'
-         '292b74a5a09a0bd9a4a658823adc034b'
-         '25ebc6cf829089a9f330ad177befdd45'
-         'd795bca44fb73cdf8a2b550e27c50b6f'
-         'acad2273520f13f4d0638ca9109ca2d8'
-         'a0d469dd2b9ec40dbe20377c51ca904c')
+pkgrel=4
+pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids.'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=http://$pkgname.sourceforge.net/
+license=BSD
+depends=(
+  apr
+  confuse
+  #php-embed
+  python2
+  rrdtool
+)
+install=$pkgname.install
+options=(!libtool)
+optdepends="$pkgname-web: Web frontend"
+backup=(
+  etc/ganglia/gmond.conf
+  etc/ganglia/gmetad.conf
+)
+source=(
+  http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+  gmetad.service.in
+  gmond.service.in
+)
+sha512sums=(
+  2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394
+  a42b7dcb7dd81961cc9fef114f8c4c352375ed931dc2ae77b1139c6fde7cbd6544fcb5fe286ff6066ef37696821dc9f6fcab7c6b14d3ebaa59e895219cd89836
+  c362a383cbbaf5540b5d698f664534bd0da73bcc5ee4336c468844ed17706e05450f35e4f6cf969f1d2495c462883873b30e4575b9ee8ded74ab475afda608bb
+)
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $srcdir/$pkgname-$pkgver
 
-  for patch in $srcdir/*.patch; do
-    msg2 "Applying $(basename $patch)"
-    patch -Np1 -i $patch
-  done
+  #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure
+
+  sed -i 's|nobody|ganglia|' gmetad/gmetad.conf.in
 
   # FIXME: Hopefully this will soon no longer be required?
-  msg2 "Copying systemd units into source as workaround for bug"
-  cp "$srcdir/gmond.service" "$srcdir/$pkgname-$pkgver/gmond/gmond.service.in"
-  cp "$srcdir/gmetad.service" "$srcdir/$pkgname-$pkgver/gmetad/gmetad.service.in"
+  msg2 'Copying systemd units into source as workaround for bug'
+  cp $srcdir/gmetad.service.in gmetad/gmetad.service.in
+  cp $srcdir/gmond.service.in  gmond/gmond.service.in
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc/ganglia \
-              --with-gmetad --enable-gexec --enable-status \
-              --with-python=/usr/bin/python2
-  make
+  cd $srcdir/$pkgname-$pkgver
+  setarch $CARCH ./configure --prefix=/usr\
+    --enable-gexec\
+    --enable-perl\
+    --enable-setuid=ganglia\
+    --enable-status\
+    --disable-static\
+    --libdir=/usr/lib\
+    --with-gmetad\
+    --with-python=/usr/bin/python2\
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc/ganglia
+#    --enable-php\
+#    --enable-setgid=ganglia\
+  setarch $CARCH make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # Move sbin to bin
-  mv "$pkgdir/usr/sbin"/* "$pkgdir/usr/bin/"
-  rmdir "$pkgdir/usr/sbin"
+  cd $srcdir/$pkgname-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
 
-  mkdir -p "$pkgdir/usr/lib/ganglia/python_modules"
+  mkdir $pkgdir/usr/lib/$pkgname/python_modules
 
-  msg2 "Generating default gmond.conf"
-  ./gmond/gmond --default_config > "$pkgdir/etc/ganglia/gmond.conf"
-  
-  # Uncomment these lines to install the rc files
-  #install -m 755 -D "$srcdir/gmond.rc" "$pkgdir/etc/rc.d/gmond"
-  #install -m 755 -D "$srcdir/gmetad.rc" "$pkgdir/etc/rc.d/gmetad"
+  msg2 'Generating default gmond.conf'
+  ./gmond/gmond --default_config > $pkgdir/etc/ganglia/gmond.conf
 }
diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install
index 60b7f102d..6a196af1f 100644
--- a/pcr/ganglia/ganglia.install
+++ b/pcr/ganglia/ganglia.install
@@ -1,32 +1,24 @@
-# arg 1:  the new package version
 post_install() {
-  post_upgrade
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
   if [ "`vercmp $2 3.4.0`" -lt 0 ]; then
-    echo "WARNING: The ganglia package has been split. If you use the" \
+    echo 'WARNING: The ganglia package has been split. If you use the' \
          "web frontend, you'll need to install the ganglia-web package as well."
   fi
   id ganglia  >& /dev/null
   if [ $? -ne 0 ]; then
-     echo "Adding ganglia system group and user..."
-     groupadd -r ganglia
-     useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia
+     echo 'Adding ganglia system group and user...'
+     groupadd -r ganglia && useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia
      # Lock the account to prevent logging in
      passwd -l ganglia &> /dev/null
   fi
-  install -d -o ganglia -g ganglia /var/lib/ganglia
-  install -d -o ganglia -g ganglia /var/lib/ganglia/rrds
+  install -d -o ganglia -g ganglia /var/lib/ganglia && install -d -o ganglia -g ganglia /var/lib/ganglia/rrds
+}
+
+post_upgrade() {
+  post_install
 }
 
-# arg 1:  the old package version
 post_remove() {
-  echo "Removing ganglia system group and user..."
+  echo 'Removing ganglia system group and user...'
   userdel ganglia
-  echo "NOTE: Please remove /var/lib/ganglia manually if it is no longer required."
+  echo 'NOTE: Please remove /var/lib/ganglia manually if it is no longer required.'
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ganglia/gmetad.rc b/pcr/ganglia/gmetad.rc
deleted file mode 100644
index 823062fac..000000000
--- a/pcr/ganglia/gmetad.rc
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-  PID=`pidof -o %PPID /usr/sbin/gmetad`
-}
-get_pid
-
-case "$1" in
-  start)
-    stat_busy "Starting Ganglia gmetad"
-    [ -z "$PID" ] && /usr/sbin/gmetad
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      sleep 1
-      get_pid
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $PID > /var/run/gmetad.pid
-        add_daemon gmetad
-        stat_done
-      fi
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Ganglia gmetad"
-    [ ! -z "$PID" ]  && kill $PID > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      sleep 1
-      get_pid
-      if [ $? -gt 0 ]; then
-        rm /var/run/gmetad.pid
-        rm_daemon gmetad
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"
-    exit 1
-
-esac
diff --git a/pcr/ganglia/gmetad.service b/pcr/ganglia/gmetad.service.in
index a721c2b4c..a721c2b4c 100644
--- a/pcr/ganglia/gmetad.service
+++ b/pcr/ganglia/gmetad.service.in
diff --git a/pcr/ganglia/gmond.rc b/pcr/ganglia/gmond.rc
deleted file mode 100644
index c465c4dbf..000000000
--- a/pcr/ganglia/gmond.rc
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-  PID=`pidof -o %PPID /usr/sbin/gmond`
-}
-get_pid
-
-case "$1" in
-  start)
-    stat_busy "Starting Ganglia gmond"
-    [ -z "$PID" ] && /usr/sbin/gmond
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      sleep 1
-      get_pid
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $PID > /var/run/gmond.pid
-        add_daemon gmond
-        stat_done
-      fi
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Ganglia gmond"
-    [ ! -z "$PID" ]  && kill $PID > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      sleep 1
-      get_pid
-      if [ $? -gt 0 ]; then
-        rm /var/run/gmond.pid
-        rm_daemon gmond
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"
-    exit 1
-
-esac
diff --git a/pcr/ganglia/gmond.service b/pcr/ganglia/gmond.service.in
index 5cbd31629..5cbd31629 100644
--- a/pcr/ganglia/gmond.service
+++ b/pcr/ganglia/gmond.service.in
diff --git a/pcr/ganglia/uid.patch b/pcr/ganglia/uid.patch
deleted file mode 100644
index 165549033..000000000
--- a/pcr/ganglia/uid.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -1588,7 +1588,7 @@ Optional Features:
- 
-   --enable-debug          turn on debugging output and compile options
-   --enable-gexec          turn on gexec support (platform-specific)
--  --enable-setuid=USER    turn on setuid support (default setuid=nobody)
-+  --enable-setuid=USER    turn on setuid support (default setuid=ganglia)
-   --enable-setgid=GROUP   turn on setgid support (default setgid=no)
-   --enable-pedantic       turn on pedantic mode during compile
-   --enable-memcheck       turn on memory checking during compile
-@@ -11152,7 +11152,7 @@ $as_echo "#define SUPPORT_GEXEC 0" >>confdefs.h
- fi
- 
- 
--setuid_user=nobody
-+setuid_user=ganglia
- # Check whether --enable-setuid was given.
- if test "${enable_setuid+set}" = set; then :
-   enableval=$enable_setuid; if test x"$enableval" != xno; then no_setuid=0; setuid_user=$enableval ; fi
---- a/gmetad/gmetad.conf.in
-+++ b/gmetad/gmetad.conf.in
-@@ -99,8 +99,8 @@ data_source "my cluster" localhost
- #-------------------------------------------------------------------------------
- # User gmetad will setuid to (defaults to "nobody")
- # default: "nobody"
--# setuid_username "nobody"
--#
-+setuid_username "ganglia"
-+
- #-------------------------------------------------------------------------------
- # Umask to apply to created rrd files and grid directory structure
- # default: 0 (files are public)
diff --git a/pcr/gimp-art/PKGBUILD b/pcr/gimp-art/PKGBUILD
index 11c3b191b..cd38b329d 100644
--- a/pcr/gimp-art/PKGBUILD
+++ b/pcr/gimp-art/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=gimp-art
 pkgver=2.8.2
diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license
index 64267a6c0..0f060c013 100644
--- a/pcr/gimp-art/gimp-splash-artwork.license
+++ b/pcr/gimp-art/gimp-splash-artwork.license
@@ -1,7 +1,7 @@
 GIMP LIBRE SPLASH LICENSE
 
-Logo and Effects is created by Zé Lara <ze.lara@adinet.com.uy> and Márcio Silva <coadde@adinet.com.uy>
-Idea by André Silva <andre.paulista@adinet.com.uy>
+Logo and Effects is created by Zé Lara <ze.miguel.lara@gmail.com> and Márcio Silva <coadde@lavabit.com>
+Idea by André Silva <emulatorman@lavabit.com>
 
 The GIMP LIBRE splash screen is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. 
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send aletter to Creative Commons, 444 Castro Street,
@@ -10,4 +10,4 @@ Suite 900, Mountain View, California, 94041, USA.
 Sangeno Waterfall Picture is created by Abedinali from Wikimedia Commons under the Creative Commons CC0 1.0 Universal license (Public Domain).
 To the extent possible under law, Abedinali from Wikimedia Commons has waived all copyright and related or neighboring rights to Sangeno Waterfall. 
 This work is published from: United States. 
-https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg
-\ No newline at end of file
+https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg
diff --git a/pcr/gimp-toolkit-gps/PKGBUILD b/pcr/gimp-toolkit-gps/PKGBUILD
new file mode 100644
index 000000000..9f5784608
--- /dev/null
+++ b/pcr/gimp-toolkit-gps/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=gimp-toolkit-gps
+_pkgname=${pkgname:13}
+_reqname=${pkgname::4}
+pkgver=2.0
+_pkgver=${pkgver/./_}
+pkgrel=1
+_pkgsrc1=${_pkgname^^}%20$_pkgver%20final
+_pkgsrc2=${_pkgname^^}%20extras
+pkgdesc='GIMP Paint Studio is a collection of brushes and accompanying tool presets. highly useful feature of the GIMP.'
+arch=any
+license=(
+  GPL2
+  CCPL:by-sa
+)
+url=https://code.google.com/p/$_pkgname-gimp-paint-studio
+depends=gimp
+conflicts=${pkgname/kit/set}
+replaces=${pkgname/kit/set}
+makedepends=unzip-libre
+noextract=(
+  $_pkgsrc1.zip
+  $_pkgsrc2.zip
+)
+source=(
+  https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc1.zip
+  https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc2.zip
+)
+sha512sums=(
+  b06016eab194db7862590940c6fb7e9c14bbb6d3ce83c2b85293da2c75ecf8b9e64585a38f749da36d63e2711a25a0073415568f10be4b997120d93ba2b5c112
+  c3ef322898299bde60f2c8e29ebdd5fa47236f6b2859bf5d3d01a92290e1ad888ba71b0813f7325921c87bf57632cf794da31e8ccab0c46cb020be52d2c1135f
+)
+
+prepare() {
+  a=$srcdir/$_pkgname-$pkgver
+  mkdir $a
+  unzip $srcdir/$_pkgsrc1.zip -d $a
+  unzip $srcdir/$_pkgsrc2.zip -d $a
+  # drop useless splashes
+  rm -v $a/splashes/* && rmdir -v $a/splashes
+  # fix perm for custom umask
+  find $srcdir/$_pkgname-$pkgver -type d -exec chmod 0755 -R {} \; &&\
+    find $srcdir/$_pkgname-$pkgver -type f -exec chmod 0644 -R {} \;
+}
+
+package() {
+  b=$pkgdir/usr/share/gimp/2.0
+  install -d $b
+  cp -va $srcdir/$_pkgname-$pkgver/* $b
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD
index 538949f60..6b27ff5f4 100644
--- a/pcr/lcmc/PKGBUILD
+++ b/pcr/lcmc/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=lcmc
 pkgver=1.5.1
diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD
deleted file mode 100644
index 5f7168f86..000000000
--- a/pcr/libav-builder/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-static=false
-pkgbase=libav
-if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
-  pkgname=libav-static-builder
-elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
-  pkgname=libav-builder
-fi
-pkgflag=builder
-pkgver=9.3
-pkgrel=1
-pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)"
-arch=any
-url="http://$pkgbase.org/"
-license=GPL
-depends=${pkgname%-$pkgflag}=$pkgver
-conflicts=(
-  ffmpeg
-  ffmpeg-static
-)
-if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
-  conflicts+=(
-    ${pkgname%-static-$pkgflag}
-  )
-elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
-  conflicts+=(
-    ${pkgname%-$pkgflag}-static
-  )
-fi
-
-package() {
-  install -m755 -d $pkgdir/usr/{include,lib{,/pkgconfig}}
-  include_list=$(ls /opt/${pkgname%-$pkgflag}/include)
-  for i in $include_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/include/$i $pkgdir/usr/include
-  done
-  lib_list=$(ls /opt/${pkgname%-$pkgflag}/lib | grep lib)
-  for l in $lib_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/lib/$l $pkgdir/usr/lib
-  done
-  pkgconfig_list=$(ls /opt/${pkgname%-$pkgflag}/lib/pkgconfig)
-  for c in $pkgconfig_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/lib/pkgconfig/$c $pkgdir/usr/lib/pkgconfig
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index 05dd756c0..782e12a15 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -1,11 +1,7 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 static=false
-pkgbase=libav
+_pkgname=libav
 if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
   pkgname=libav-static
   pkgflag=-static
@@ -13,7 +9,7 @@ if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
 elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
   pkgname=libav
 fi
-pkgver=9.3
+pkgver=9.7
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc"
 arch=(
@@ -21,10 +17,8 @@ arch=(
   x86_64
   mips64el
 )
-url="http://$pkgbase.org/"
-license=(
-  GPL
-)
+url=http://$_pkgname.org/
+license=GPL3
 depends=(
   alsa-lib
   bzip2
@@ -37,7 +31,8 @@ depends=(
   libvorbis
   libvpx
   opencore-amr
-  openjpeg
+  #openjpeg
+  opus
   rtmpdump
   schroedinger
   sdl
@@ -50,30 +45,29 @@ makedepends=(
   yasm
   libvdpau
 )
-source=(
-  http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz
-)
-sha512sums=(
-  de3aaa571fed67d22ec2a0c53599af56684afa38445cf67fd09d26c23eeded5a184d045f472d414815d17783b421f937fd3d9565637e20f2050aaaf0081164fe
-)
+source=http://$_pkgname.org/releases/$_pkgname-$pkgver.tar.gz
+sha512sums=6a446e8dceb9ee4f1fb7a7d68d254086990bbcab5b1014598b21c75e0add22dab47c30a95bc3129835cc40a8d32de9c61fb267b2fa2aa9353dbbfc4b716767e4
 
 build() {
-  cd $pkgbase-$pkgver
+  cd $_pkgname-$pkgver
 
   [[ $static == false ]] && sttcv=disable || sttcv=enable
 
-  ./configure\
+  setarch $CARCH ./configure\
     --prefix=/opt/$pkgname\
     --disable-debug\
     --$sttcv-static\
     --enable-avresample\
+    --enable-avserver\
+    --enable-dxva2\
     --enable-gpl\
     --enable-libfreetype\
     --enable-libgsm\
     --enable-libmp3lame\
     --enable-libopencore_amrnb\
     --enable-libopencore_amrwb\
-    --enable-libopenjpeg\
+    --disable-libopenjpeg\
+    --enable-libopus\
     --enable-libpulse\
     --enable-librtmp\
     --enable-libschroedinger\
@@ -87,14 +81,13 @@ build() {
     --enable-shared\
     --enable-version3\
     --enable-x11grab
-
   setarch $CARCH make
   setarch $CARCH make tools/qt-faststart
   setarch $CARCH make doc/av{conv,play,server}.1
 }
 
 package() {
-  cd $pkgbase-$pkgver
+  cd $_pkgname-$pkgver
   setarch $CARCH make DESTDIR=$pkgdir install install-man
   install -m755 -d                              $pkgdir/etc/ld.so.conf.d
   install -m755 -d                              $pkgdir/usr/bin
@@ -103,10 +96,12 @@ package() {
   ln -s /opt/$pkgname/bin/avconv                $pkgdir/usr/bin/avconv$pkgflag
   ln -s /opt/$pkgname/bin/avplay                $pkgdir/usr/bin/avplay$pkgflag
   ln -s /opt/$pkgname/bin/avprobe               $pkgdir/usr/bin/avprobe$pkgflag
+  ln -s /opt/$pkgname/bin/avserver              $pkgdir/usr/bin/avserver$pkgflag
   ln -s /opt/$pkgname/bin/qt-faststart          $pkgdir/usr/bin/qt-faststart-$pkgname
   ln -s /opt/$pkgname/share/man/man1/avconv.1   $pkgdir/usr/share/man/man1/avconv$pkgflag.1
   ln -s /opt/$pkgname/share/man/man1/avplay.1   $pkgdir/usr/share/man/man1/avplay$pkgflag.1
   ln -s /opt/$pkgname/share/man/man1/avprobe.1  $pkgdir/usr/share/man/man1/avprobe$pkgflag.1
+  ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1
   echo /opt/libav$pkgflag/lib                 > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf
 }
 
diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD
index 6b9d7d9d7..85b3ff082 100644
--- a/pcr/libqb/PKGBUILD
+++ b/pcr/libqb/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=libqb
 pkgver=0.14.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Library with the primary purpose of providing high performance client server reusable features'
 arch=(
   i686
@@ -14,7 +14,7 @@ makedepends=(
   splint
 )
 license=LGPL2.1
-options=!libtool
+options=(!libtool)
 url=https://github.com/asalkeld/$pkgname/wiki
 source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz
 sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977
@@ -25,7 +25,8 @@ build() {
   setarch $CARCH ./configure --prefix=/usr\
     --disable-fatal-warnings\
     --disable-static\
-    --libdir=/usr/lib
+    --libdir=/usr/lib\
+    --sbindir=/usr/bin
   setarch $CARCH make
 }
 
diff --git a/pcr/lilo/PKGBUILD b/pcr/lilo/PKGBUILD
new file mode 100644
index 000000000..10d334b05
--- /dev/null
+++ b/pcr/lilo/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Connor Behan <connor.behan@gmail.com>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=lilo
+pkgver=24.0
+pkgrel=1
+pkgdesc="A bootloader for GNU/Linux (Parabola rebranded)"
+arch=('i686' 'x86_64')
+url="https://alioth.debian.org/projects/lilo/"
+license=('BSD')
+backup=('etc/lilo.conf')
+depends=('device-mapper' 'coreutils')
+makedepends=('bin86' 'sharutils')
+optdepends=('perl: to use keytab-lilo')
+install=lilo.install
+options=('!makeflags')
+source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz"
+        'lilo.conf')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  export LC_ALL=C
+
+  sed -i -e 's/strip lilo.static/strip lilo.static || true/' src/Makefile
+  make all
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}"/lilo.conf "${pkgdir}"/etc/lilo.conf
+  install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  # All binaries in /usr/bin
+  mkdir "${pkgdir}"/usr/bin
+  mv "${pkgdir}"/sbin/lilo "${pkgdir}"/usr/bin/
+  mv "${pkgdir}"/usr/sbin/* "${pkgdir}"/usr/bin/
+  rm -rf "${pkgdir}"/sbin
+  rm -rf "${pkgdir}"/usr/sbin
+
+  # Avoid conflict with syslinux
+  mv "${pkgdir}"/usr/bin/keytab-lilo "${pkgdir}"/usr/bin/keytab-lilo.pl
+}
+md5sums=('03d7090835a5675314082847f1ac7910' 'd06b3c4655577ed01fea79ec5743b4b0')
diff --git a/pcr/lilo/lilo.conf b/pcr/lilo/lilo.conf
new file mode 100644
index 000000000..479390df5
--- /dev/null
+++ b/pcr/lilo/lilo.conf
@@ -0,0 +1,25 @@
+#
+# /etc/lilo.conf
+#
+
+boot=/dev/sda
+# This line often fixes L40 errors on bootup
+# disk=/dev/sda bios=0x80
+
+default=parabola
+timeout=50
+lba32
+prompt
+
+image=/boot/vmlinuz-linux-libre
+	label=parabola
+	root=/dev/sda3
+	initrd=/boot/initramfs-linux-libre.img
+	read-only
+
+image=/boot/vmlinuz-linux-libre
+	label=parabola-fallback
+	root=/dev/sda3
+	initrd=/boot/initramfs-linux-libre-fallback.img
+	read-only
+
diff --git a/pcr/lilo/lilo.install b/pcr/lilo/lilo.install
new file mode 100644
index 000000000..7375fddf8
--- /dev/null
+++ b/pcr/lilo/lilo.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+  echo
+  echo "If you use the LILO bootloader, you should run 'lilo' after upgrading."
+  echo
+}
diff --git a/pcr/maliit-framework/PKGBUILD b/pcr/maliit-framework/PKGBUILD
new file mode 100644
index 000000000..545c34a0c
--- /dev/null
+++ b/pcr/maliit-framework/PKGBUILD
@@ -0,0 +1,33 @@
+# Contributor: Jon Nordby <jononor@gmail.com>
+# Maintainer: Jon Nordby <jononor@gmail.com>
+# Maintainer (Parabola): Javier Barcena <javierbuilder@gmail.com>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=maliit-framework
+pkgver=0.99.0
+pkgrel=6
+pkgdesc="Maliit Input Methods - Framework"
+arch=('x86_64' 'i686')
+url="http://maliit.org"
+license=('LGPL')
+depends=('qt5-base' 'qt5-quick1' 'gtk2' 'gtk3' 'gconf')
+install=$pkgname.install
+source=(http://maliit.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
+md5sums=('c5e8c67cbfb514122518d92f1edcc990')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # BUILD
+  qmake -r .
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make INSTALL_ROOT="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain maliit-framework "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+} 
diff --git a/pcr/maliit-framework/maliit-framework.install b/pcr/maliit-framework/maliit-framework.install
new file mode 100755
index 000000000..08c54ae1b
--- /dev/null
+++ b/pcr/maliit-framework/maliit-framework.install
@@ -0,0 +1,30 @@
+pkgname=maliit-framework
+
+post_install() {
+  echo "Updating gtk.immodules..."
+  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+  gtk-query-immodules-3.0 --update-cache
+  echo "Done."
+
+  gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  echo "Updating gtk.immodules..."
+  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+  gtk-query-immodules-3.0 --update-cache
+  echo "Done."
+
+}
diff --git a/pcr/maliit-plugins/PKGBUILD b/pcr/maliit-plugins/PKGBUILD
new file mode 100644
index 000000000..cdab07003
--- /dev/null
+++ b/pcr/maliit-plugins/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor: Jon Nordby <jononor@gmail.com>
+# Maintainer: Jon Nordby <jononor@gmail.com>
+
+pkgname=maliit-plugins
+pkgver=0.99.0
+pkgrel=1
+pkgdesc="Maliit Input Methods - Plugins"
+arch=('x86_64' 'i686')
+url="http://maliit.org"
+license=('LGPL')
+depends=('qt5-base' 'maliit-framework')
+source=(http://maliit.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        config.patch)
+md5sums=('29f07d937803a61e74301e4616d55dbb'
+         'f43d45c9917924750edf36000492bd73')
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  # fix issue on building
+  patch -Np1 -i "$srcdir/config.patch"
+
+  # BUILD
+  qmake -r . CONFIG+=notests
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  make install INSTALL_ROOT="$pkgdir/"
+} 
diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD
index 0c7057908..9968dde38 100644
--- a/pcr/mednafen-server/PKGBUILD
+++ b/pcr/mednafen-server/PKGBUILD
@@ -1,26 +1,24 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=mednafen-server
+_pkgname=${pkgname%-server}
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A server multi-system gaming emulator'
-url=http://${pkgname%-server}.sourceforge.net/
-license=(
-  GPL
-)
+url=http://$_pkgname.sourceforge.net/
+license=GPL2
 arch=(
   i686
   x86_64
   mips64el
 )
+backup=etc/$pkgname/standard.conf
 source=(
-  http://downloads.sourceforge.net/project/${pkgname%-server}/Mednafen-Server/$pkgver/$pkgname-$pkgver.tar.gz
-  ${pkgname}d
+  http://downloads.sourceforge.net/project/$_pkgname/${_pkgname^}-Server/$pkgver/$pkgname-$pkgver.tar.gz
   $pkgname.service
 )
 sha512sums=(
   700b2021e5085761b90bb5ee802ff9ccded3cdade76682fe9faa98ebbb0653c9b00baea5baa1c486f850bad606aae33a88e4d9486015babb210648aa0cd4542d
-  55cba761db9c10978a5146e4f92ccce2a645e0566d0744e745b36ede56a0332d1cb1f6c8a09df6a1c01320b539f07ccd7073b2d85eca6b340449a1c3b9761407
   cd3d19b789ec7f62c4b8f5fe0f93e7836fab5406a3416434701caf6404cce02c7223dcb8b82bd1e4b00bdcf4df623f0cd44f850a7f79a7be73e04c0804972700
 )
 
@@ -34,6 +32,5 @@ package() {
   cd $srcdir/$pkgname
   make DESTDIR=$pkgdir install
   install -Dm644 standard.conf            $pkgdir/etc/$pkgname/standard.conf
-  install -Dm644 $srcdir/${pkgname}d      $pkgdir/etc/rc.d/$pkgname
   install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 219da84fc..f2d7f83b0 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -4,32 +4,31 @@ pkgname=(
   mitsuba
   blender-addon-mitsuba
 )
+_pkgname=${pkgname[0]}
 _bldname=${pkgname[1]::7}
-_addname=${pkgname[0]}-${_bldname}
-pkgver=0.4.4 # Thu Feb 28 15:00:37 2013 -0800 tag:v0.4.4 rev:1674
-_pkgdat=20130228
-_pkgrev=1674
-_bldver=2.66
+_addname=$_pkgname-$_bldname
+pkgver=0.4.4
+_bldver=2.67
 _addver=0.2.1 # Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version)
 _adddat=20130320
 _addrev=40
-_bldep=7
+_bldep=8
 _pyver=3.3
-pkgrel=1
+pkgrel=3
 pkgdesc='A physically based renderer'
 arch=(
   i686
   x86_64
   mips64el
 )
-url=https://${pkgname[0]}-renderer.org/
+url=https://www.$_pkgname-renderer.org/
 license=GPL3
 depends=(
   boost-libs
   collada-dom
   glew
   libxxf86vm
-  'openexr=2.0.0'
+  openexr
   qt4
   xerces-c
 )
@@ -44,28 +43,25 @@ makedepends=(
   mercurial
   python
 )
-install=$pkgname.install
+install=$_pkgname.install
 source=(
-  hg+https://${pkgname[0]}-renderer.org/hg/${pkgname[0]}
-  hg+https://${pkgname[0]}-renderer.org/hg/$_addname
+  ${url}hg/$_pkgname/archive/v$pkgver.tar.bz2
+  hg+${url}hg/$_addname
   ${pkgname[1]}.install
 )
-sha512sums=(SKIP SKIP SKIP)
+sha512sums=(
+  66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c
+  SKIP SKIP
+)
 
 prepare() {
   mv $srcdir/${pkgname[1]}.install $startdir
 
-  cd $srcdir/${pkgname[0]}
+  cd $srcdir/$_pkgname-v$pkgver
 
   [[ -d build ]] && rm -r build
   mkdir build
 
-  cd $startdir/../srcdest/${pkgname[0]}
-
-  msg "${pkgname[0]}"
-  hg update -c v$pkgver
-  hg log -l 1 -r v$pkgver
-
   cd $startdir/../srcdest/$_addname
 
   msg "${pkgname[1]}"
@@ -74,7 +70,7 @@ prepare() {
 }
 
 build() {
-  cd $srcdir/${pkgname[0]}/build
+  cd $srcdir/$_pkgname-v$pkgver/build
 
   [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF'
 
@@ -83,24 +79,23 @@ build() {
     -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\
     -DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\
     -DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so
-
   setarch $CARCH make
 }
 
 package_mitsuba() {
-  cd $srcdir/${pkgname[0]}/build
+  cd $srcdir/$_pkgname-v$pkgver/build
   setarch $CARCH make DESTDIR=$pkgdir install
 
   #fixing files and folders location
   a=$pkgdir/usr
-  b=$srcdir/${pkgname[0]}
-  install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}${pkgname[0]},pixmaps}}
-  install -m644 $b/data/linux/${pkgname[0]}.desktop         $a/share/applications
-  install -m644 $b/src/mtsgui/resources/${pkgname[0]}48.png $a/share/pixmaps
-  install -m644 $b/doc/license.txt                          $a/share/licenses/${pkgname[0]}/LICENSE
+  b=$srcdir/$_pkgname-v$pkgver
+  install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}}
+  install -m644 $b/data/linux/$_pkgname.desktop           $a/share/applications
+  install -m644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps
+  install -m644 $b/doc/license.txt                        $a/share/licenses/$_pkgname/LICENSE
   mv $a/{m{itsuba,ts{gui,import,srv,util}},bin}
   mv $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,}
-  mv $a/{{data,plugins},share/${pkgname[0]}}
+  mv $a/{{data,plugins},share/$_pkgname}
   mv $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
   mv $a/{sdk/include,}
   rmdir $a/{python,sdk}
@@ -124,7 +119,7 @@ package_blender-addon-mitsuba() {
 
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
   b=$pkgdir/usr/share/licenses/$pkgname
-  c=$srcdir/$_pkgname/doc/license.txt
+  c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
 
   install -d $a && cp -a $_pkgname $a
   install -d $b && install -m644 $c $b/LICENSE
diff --git a/pcr/par/PKGBUILD b/pcr/par/PKGBUILD
new file mode 100644
index 000000000..761ac9193
--- /dev/null
+++ b/pcr/par/PKGBUILD
@@ -0,0 +1,30 @@
+# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
+# Contributor: quantax -- contact via Arch Linux forum or AUR
+
+pkgname=par
+pkgver=1.52
+pkgrel=2
+pkgdesc="Paragraph reformatter"
+url="http://www.nicemice.net/par/"
+depends=('glibc')
+arch=(i686 x86_64)
+license=('Custom')
+source=(http://www.nicemice.net/par/Par152-autoconf.tar.gz 
+        http://www.nicemice.net/par/Par152.tar.gz )
+md5sums=('83e4d23a943ab07c44dd995b73195c70' 
+         '4ccacd824171ba2c2f14fb8aba78b9bf')
+
+build() {
+  cd $srcdir/Par152
+  
+  ./configure --prefix=/usr
+  
+  make
+}
+  
+package() {
+  cd $srcdir/Par152
+  install --mode=755 -D par "${pkgdir}/usr/bin/par"
+  install --mode=644 -D par.1 "${pkgdir}/usr/share/man/man1/par.1"
+  install --mode=644 -D par.doc "${pkgdir}/usr/share/licenses/${pkgname}/par.doc"
+}
diff --git a/pcr/perl-crypt-dh/PKGBUILD b/pcr/perl-crypt-dh/PKGBUILD
new file mode 100644
index 000000000..e2c9b5a3c
--- /dev/null
+++ b/pcr/perl-crypt-dh/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer (AUR): Michael Witten
+#
+# Derived from perl-crypt-blowfish:
+#   Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+#   Contributor: Charles Mauch <cmauch@gmail.com>
+#
+# Contributor: Pedro Alejandro López-Valencia <palopezv@gmail.com>
+
+pkgname=perl-crypt-dh
+pkgver=0.07
+pkgrel=3
+
+pkgdesc='Perl/CPAN Module Crypt::DH: Diffie-Hellman key exchange system'
+
+_cpan_name=Crypt-DH-$pkgver
+url=http://search.cpan.org/~mithaldu/$_cpan_name/lib/Crypt/DH.pm
+
+license=(GPL PerlArtistic)
+source=("http://search.cpan.org/CPAN/authors/id/M/MI/MITHALDU/$_cpan_name.tar.gz")
+md5sums=(5494c91420bf77de4af808fcafb6c3ce)
+
+arch=(any)
+makedepends=(make)
+depends=(perl perl-math-bigint-gmp)
+
+build()
+{
+  cd "$srcdir/$_cpan_name"
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check()
+{
+  cd "$srcdir/$_cpan_name"
+  make test
+}
+
+package()
+{
+  cd "$srcdir/$_cpan_name"
+  make pure_install DESTDIR="$pkgdir"
+
+  cd "$pkgdir"
+  find . -name '.packlist' -delete
+  find . -name '*.pod'     -delete
+}
diff --git a/pcr/perl-geo-ipfree/PKGBUILD b/pcr/perl-geo-ipfree/PKGBUILD
new file mode 100644
index 000000000..394e38ca1
--- /dev/null
+++ b/pcr/perl-geo-ipfree/PKGBUILD
@@ -0,0 +1,28 @@
+_author=bricas
+_perlmod=Geo-IPfree
+pkgname=perl-geo-ipfree
+pkgver=1.131650
+pkgrel=1
+pkgdesc="An IPv4 to country lookup database"
+arch=('any')
+url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
+license=('GPL' 'PerlArtistic')
+depends=('perl>=5.10.0')
+options=(!emptydirs)
+source=(http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/$_perlmod-$pkgver.tar.gz)
+md5sums=('23d71e4f9a872184d9b4c6903c5a2b98')
+
+build() {
+  cd "$srcdir/$_perlmod-$pkgver"
+
+  # Install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+package() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make install DESTDIR="$pkgdir/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/perl-math-bigint-gmp/PKGBUILD b/pcr/perl-math-bigint-gmp/PKGBUILD
new file mode 100644
index 000000000..32923d432
--- /dev/null
+++ b/pcr/perl-math-bigint-gmp/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer (AUR): Pedro Alejandro López-Valencia <palopezv@gmail.com>
+
+_author=PJACKLAM
+_perlmod=Math-BigInt-GMP
+pkgname=perl-math-bigint-gmp
+pkgver=1.37
+pkgrel=2
+pkgdesc="Big integer calculations using the GNU Multiple Precision Arithmetic Library."
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
+license=('GPL' 'PerlArtistic')
+depends=('perl>=5.16.2' 'gmp')
+options=(!emptydirs)
+source=(http://cpan.perl.org/modules/by-authors/id/P/PJ/$_author/$_perlmod-$pkgver.tar.gz)
+md5sums=('d11bf69c0471e38191f33144079d0373')
+
+build() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  # Install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make test
+}
+
+package() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make install DESTDIR="$pkgdir/"
+
+  find ${pkgdir} -name '.packlist' -delete
+  find ${pkgdir} -name '*.pod' -delete
+}
+
+# vim:set ts=2 sw=2 et ft=sh:
diff --git a/pcr/perl-net-sftp-foreign/Changes b/pcr/perl-net-sftp-foreign/Changes
index eff2bb00b..f730a8973 100644
--- a/pcr/perl-net-sftp-foreign/Changes
+++ b/pcr/perl-net-sftp-foreign/Changes
@@ -1,5 +1,48 @@
 Revision history for Net::SFTP::Foreign
 
+1.75  Apr 2, 2013
+        - release as stable
+
+1.74_07  Mar 21, 2013
+        - seek method was returning offset instead of success value
+          (bug report by Paul Kolano).
+
+1.74_06  Mar 12, 2013
+        - disconnect may kill some unrelated process when called
+          repeatly (bug report by Douglas Wilson)
+        - debug was clobbering $!
+
+1.74_05  Feb 5, 2013
+        - error was not being set on timeouts (bug report by Kqfh
+          Jjgrn)
+
+1.74_04  Oct 25, 2012
+        - overwriting rename of a file over itself was broken (bug
+          report by Mike Wilder)
+        - stat and lstat path arguments is now optional and defaults
+          to '.' (bug report by Paul Kolano)
+        - fstat was broken
+        - add git repository and bugtracker into meta files
+
+1.74_03  Sep 21, 2012
+        - put_content was broken (bug report by Caleb Cushing)
+        - document put_content method
+        - add more tests
+
+1.74_02  Jul 11, 2012
+        - rget was dieing when trying to copy remote symbolic links
+        - add support for get method slow-start feature: when file
+          size is unknown don't start asking for $queue_size packets
+          as it slows down the transfer of small files, instead,
+          starting from a queue size of one go gradually increasing it
+          until the stated maximum is reached (bug report by David
+          R. Wagner)
+        - parse supported2 extension
+
+1.74_01
+        - add support for password_prompt (feature request by Douglas
+          Wilson)
+
 1.73  May 11, 2012
         - password authentication was broken on Solaris (maybe also on
           others) due to an incorrect waitpid call (bug report and
@@ -134,6 +177,7 @@ Revision history for Net::SFTP::Foreign
           get_symlink options using hashes
         - remove operation inside put_symlink was clobbering error and
           status from previous symlink call
+        - solve several minor bugs related to autodie handling
         - do not die from inside DESTROY methods when autodie is set
         - resume feature in get method was broken
         - refactor numbered logic inside _inc_numbered sub
diff --git a/pcr/perl-net-sftp-foreign/PKGBUILD b/pcr/perl-net-sftp-foreign/PKGBUILD
index 61fb3b8df..5bb9a69a4 100644
--- a/pcr/perl-net-sftp-foreign/PKGBUILD
+++ b/pcr/perl-net-sftp-foreign/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Alessandro Sagratini <ale_sagra at hotmail dot com>
 pkgname=perl-net-sftp-foreign
-pkgver=1.73
+pkgver=1.75
 pkgrel=1
 pkgdesc="Perl SFTP client using the native SSH client application"
 arch=(any)
@@ -11,7 +11,7 @@ optdepends=('perl-file-which' 'perl-sort-key')
 options=(!emptydirs)
 changelog=Changes
 source=(http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Net-SFTP-Foreign-$pkgver.tar.gz)
-md5sums=('3de69b9281027e484a30e3efa581981f')
+md5sums=('2545691cd69f8515dd9c126cc52e40c5')
 
 build() {
 	cd "$srcdir/Net-SFTP-Foreign-$pkgver"
diff --git a/pcr/perl-php-serialization/PKGBUILD b/pcr/perl-php-serialization/PKGBUILD
index f09269c92..5ccc64e40 100644
--- a/pcr/perl-php-serialization/PKGBUILD
+++ b/pcr/perl-php-serialization/PKGBUILD
@@ -1,10 +1,10 @@
-# Contributor: Justin Davis <jrcd83@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.18
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
+# CPAN Name  : PHP-Serialization
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
 pkgname='perl-php-serialization'
 pkgver='0.34'
-pkgrel='1'
+pkgrel='2'
 pkgdesc="simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa."
 arch=('any')
 license=('PerlArtistic' 'GPL')
@@ -15,7 +15,7 @@ url='http://search.cpan.org/dist/PHP-Serialization'
 source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz')
 md5sums=('333af0848ad79931875a35cc61dc22e0')
 sha512sums=('72218973f21ab71419751cf818e6bd998235aa74bf8ae60ec4a6080ba169d0d7fcefde4f433ce3f6f30ed3084a651deb8aa3a5dd818fc6ebf3fb6188def4efe7')
-_distdir="${srcdir}/PHP-Serialization-0.34"
+_distdir="PHP-Serialization-0.34"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -24,22 +24,23 @@ build() {
       PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "$srcdir/$_distdir"
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   make install
+
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
diff --git a/pcr/perl-sys-mmap/PKGBUILD b/pcr/perl-sys-mmap/PKGBUILD
index e563d5da7..43540e07f 100644
--- a/pcr/perl-sys-mmap/PKGBUILD
+++ b/pcr/perl-sys-mmap/PKGBUILD
@@ -1,9 +1,10 @@
-# Contributor: Justin Davis <jrcd83@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.18
+# CPAN Name  : Sys-Mmap
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
 pkgname='perl-sys-mmap'
 pkgver='0.16'
-pkgrel='1'
+pkgrel='3'
 pkgdesc="uses mmap to map in a file as a Perl variable"
 arch=('i686' 'x86_64')
 license=('PerlArtistic' 'GPL')
@@ -14,7 +15,7 @@ url='http://search.cpan.org/dist/Sys-Mmap'
 source=('http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/Sys-Mmap-0.16.tar.gz')
 md5sums=('faae869e876fa86f92e6de3f13af3aef')
 sha512sums=('9f533f8eaa2707a77fa69dc0163e5e55b13d6653ddb5f7850c3fcaa090c79069cccedb947c1b8cd5a125fd7b055803eff437697c120785f422bff0414be7cd05')
-_distdir="${srcdir}/Sys-Mmap-0.16"
+_distdir="Sys-Mmap-0.16"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -23,22 +24,23 @@ build() {
       PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "$srcdir/$_distdir"
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   make install
+
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
diff --git a/pcr/perl-x10/PKGBUILD b/pcr/perl-x10/PKGBUILD
index 51283d599..0a0d352cb 100644
--- a/pcr/perl-x10/PKGBUILD
+++ b/pcr/perl-x10/PKGBUILD
@@ -1,30 +1,51 @@
-# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
-# Contributor: Ross melin <rdmelin@gmail.com>
+# CPAN Name  : X10
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
-# Required by zoneminder
-
-pkgname=perl-x10
-pkgver=0.03
-pkgrel=2
-pkgdesc="X10"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/~ROBF/X10"
-license=('GPL' 'PerlArtistic')
-depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules')
+pkgname='perl-x10'
+pkgver='0.03'
+pkgrel='3'
+pkgdesc=""
+arch=('any')
+license=('PerlArtistic' 'GPL')
 options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/R/RO/ROBF/X10-$pkgver.tar.gz) 
+depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules')
+makedepends=()
+url='http://search.cpan.org/dist/X10'
+source=('http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/X10-0.03.tar.gz')
 md5sums=('056b3d98fab545865148b948de6784c7')
+sha512sums=('6ed2b9526732dc5f704ceb94f3a9abb51c208aabb6f127480046ce1f01ecf763e4de2dcb5bf52ef598831dbd5ba78ff9d108238001070076b0cc05c7681dea2f')
+_distdir="X10-0.03"
 
 build() {
-  cd  $startdir/src/X10-$pkgver
-  eval `perl -V:archname`
-  PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL \
-      INSTALLDIRS=vendor || return 1
-  
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install || return 1
-  /usr/bin/find $startdir/pkg -name '.packlist' -delete
-  /usr/bin/find $startdir/pkg -name '*.pod' -delete
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
+      PERL_AUTOINSTALL=--skipdeps                            \
+      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
+      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      MODULEBUILDRC=/dev/null
+
+    cd "$srcdir/$_distdir"
+    /usr/bin/perl Makefile.PL
+    make
+  )
+}
+
+check() {
+  cd "$srcdir/$_distdir"
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
+    make test
+  )
+}
+
+package() {
+  cd "$srcdir/$_distdir"
+  make install
+
+  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
+# Local Variables:
+# mode: shell-script
+# sh-basic-offset: 2
+# End:
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/python2-paramiko/PKGBUILD b/pcr/python2-paramiko/PKGBUILD
deleted file mode 100644
index da62b4e28..000000000
--- a/pcr/python2-paramiko/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Mario Danic <mario.danic@gmail.com>
-
-pkgbase=python-paramiko
-pkgname=python2-paramiko
-pkgver=1.9.0
-pkgrel=1
-pkgdesc="Python module that implements the SSH2 protocol"
-url="http://www.lag.net/paramiko/"
-license=('LGPL')
-arch=('any')
-depends=('python2-crypto')
-conflicts=()
-replaces=()
-source=(http://pypi.python.org/packages/source/p/paramiko/paramiko-$pkgver.tar.gz)
-
-
-package_python2-paramiko() {
-  cd "$srcdir/paramiko-$pkgver"
-
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
-  install -dm755 "$pkgdir/usr/share/doc/$pkgname/demos"
-  install -m644 demos/* "$pkgdir/usr/share/doc/$pkgname/demos"
-  chmod 755 "$pkgdir/usr/share/doc/$pkgname/demos/"*.py
-
-  find "$pkgdir" -name '*.py' -print0 |xargs -0 \
-    sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
-    -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
-}
-md5sums=('b78472021ff6586dd61ad6972032f54f')
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index b5891747d..e9f039431 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=python2-renpy
 pkgflag=renpy
-pkgver=6.15.0
+pkgver=6.15.5
 pkgrel=1
 pkgdesc="Platform-dependant Ren'Py libraries."
 arch=(
@@ -18,18 +18,13 @@ url="http://www.$pkgflag.org/"
 depends=(
   fribidi
   glew
-  libav
-  libgl
-  python2-pygame
+  python2-pygame=1.9.1
 )
 # python-argparse is part of distribution since 2.7
 makedepends=(
-  cython2
-  libav-builder # to solve libav deps
-  mesa
   'python2>=2.7'
+  'ffmpeg'
 )
-options=!buildflags
 provides="python-$pkgflag=$pkgver"
 conflicts=(
   python-$pkgflag
@@ -44,7 +39,7 @@ source=(
 )
 
 sha512sums=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
+  fc8f640cacf1554c969ded2d9c605d4f5c8e14bff6168aa5b4040e59054be46a2b83d6df686bea7e0103a13eaa01d52322d6fa6a34a1dcac90e011e3b5d24a6e
 )
 
 build() {
diff --git a/pcr/renpy/ChangeLog b/pcr/renpy/ChangeLog
index 566d97fa9..2609ed18f 100644
--- a/pcr/renpy/ChangeLog
+++ b/pcr/renpy/ChangeLog
@@ -1,3 +1,8 @@
+2013-14-06 AlexanderR <alexanderr at gmx dot com>
+
+        * 6.15.5-1 :
+        new upstream release.
+
 2012-28-07 AlexanderR <alexanderr at gmx dot com>
 
         * 6.14.1-1 :
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index 0baad307c..1ed569477 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=renpy
-pkgver=6.15.0
+pkgver=6.15.5
 pkgrel=1
 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools."
 arch=('any')
@@ -21,14 +21,12 @@ source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2"
 	'python2.diff'
 	'renpy-launcher.sh')
 
-sha512sums=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
-  1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
-  2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
-  bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
-  3ae0627b8c12658f530f7d7a6a1e9226aee3e387c9ac011f00a4b5ed7394115c3b653f7a4a45c6ee2ef102fb584df1cec36f306eceff3d18aac49b5aad4a9fab
-  727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7
-)
+md5sums=('45e7c28a426c8d9ef470d09e7a689568'
+         'a9beb35fa6c6d8af7ba5d2a764c33158'
+         'd206d24b78e207a2c3b603fef14ac47f'
+         '8b9922e26e567248a2a5adc1d0cdfdd4'
+         '0476b16220e6faeb031e1dbfe45249b4'
+         'dfa92cdecc15e5c1ddee387fbbbb2d9c')
 
 build() {
   cd "$srcdir/renpy-$pkgver-source"
@@ -36,7 +34,8 @@ build() {
   patch -p1 < ../python2.diff
 
   # fonts are provided by ttf-dejavu
-  rm $pkgname/common/DejaVuSans.ttf $pkgname/common/DejaVuSans.txt
+  cd $pkgname
+  rm common/DejaVuSans.ttf common/DejaVuSans.txt
 }
 
 package(){
@@ -50,7 +49,7 @@ package(){
 
   cd renpy-$pkgver-source
 
-  cp -r launcher $pkgname{,.py}  template the_question tutorial "$pkgdir/usr/share/$pkgname"
+  cp -r launcher $pkgname{,.py} $pkgname/common template the_question tutorial "$pkgdir/usr/share/$pkgname"
   cp -r doc/* "$pkgdir/usr/share/doc/$pkgname"
   install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png"
   install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD
new file mode 100644
index 000000000..36bfeb18e
--- /dev/null
+++ b/pcr/retroshare/PKGBUILD
@@ -0,0 +1,148 @@
+# Maintainer: stqn
+# Contributor: JHeaton <jheaton at archlinux dot us>
+# Contributor: Tristero <tristero at online dot de>
+# Contributor: funkyou
+
+# Set this to true to build and install retroshare-nogui
+_build_nogui=false
+
+# Set this to true to build and install the plugins
+_build_linkscloud=true
+_build_feedreader=true
+_build_voip=true
+
+### Nothing to be changed below this line ###
+
+pkgname=retroshare
+pkgver=0.5.4e
+pkgrel=3
+pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
+arch=('i686' 'x86_64') 
+url="http://retroshare.sourceforge.net/"
+license=('LGPL' 'GPL')
+depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss')
+install="${pkgname}.install"
+
+source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/RetroShare-v${pkgver}.tar.gz \
+	${pkgname}.install \
+	${pkgname}.desktop)
+
+sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda'
+            '4b50547648612e9091536205402a4da9ddea9c18c0f71e5d6cd30b2226f206d9'
+            '70be00968f2477e368f75393f193e76f366fff2dadab869c855e92048060cf29')
+
+# Add missing dependencies if needed
+[[ $_build_nogui == true ]] && depends=(${depends[@]} 'libssh' 'protobuf')
+[[ $_build_voip == true ]] && depends=(${depends[@]} 'speex')
+[[ $_build_feedreader == true ]] && depends=(${depends[@]} 'curl' 'libxslt')
+
+build() {
+	local _srcdir="${srcdir}/retroshare-0.5.4/src"
+	local _qmake='qmake-qt4'
+
+	msg "Compiling OpenPGP-SDK..."
+	cd "${_srcdir}/openpgpsdk/src"
+	$_qmake
+	make
+
+	msg "Compiling libbitdht..."
+	cd "${_srcdir}/libbitdht/src"
+	$_qmake
+	make
+
+	msg "Compiling libretroshare..."
+	cd "${_srcdir}/libretroshare/src"
+	$_qmake
+	make
+
+	msg "Compiling retroshare-gui..."
+	cd "${_srcdir}/retroshare-gui/src"
+	$_qmake
+	make
+
+	if [[ "$_build_voip" == "true" ]] ; then
+		msg "Compiling VOIP plugin..."
+		cd "${_srcdir}/plugins/VOIP"
+		sed -i 's/lessThan.*/true {/' VOIP.pro
+		$_qmake
+		make
+	fi
+
+	if [[ "$_build_feedreader" == "true" ]] ; then
+		msg "Compiling FeedReader plugin..."
+		cd "${_srcdir}/plugins/FeedReader"
+		$_qmake
+		make
+	fi
+
+	if [[ "$_build_linkscloud" == "true" ]] ; then
+		msg "Compiling LinksCloud plugin..."
+		cd "${_srcdir}/plugins/LinksCloud"
+		$_qmake
+		make
+	fi
+
+	if [[ $_build_nogui == "true" ]] ; then
+		msg "Compiling retroshare-nogui..."
+		cd "${_srcdir}/rsctrl/src"
+		make
+		cd "${_srcdir}/retroshare-nogui/src"
+		sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro
+		$_qmake
+		make
+	fi
+}
+
+package() {
+	local _srcdir="${srcdir}/retroshare-0.5.4/src"
+
+	# --- Install Files ---
+
+	msg "Installing files to fakeroot-environment..."
+
+	install -D -m 755 \
+		"${_srcdir}/retroshare-gui/src/RetroShare" \
+		"${pkgdir}/usr/bin/${pkgname}"
+
+	if [[ "$_build_nogui" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/retroshare-nogui/src/retroshare-nogui" \
+			"${pkgdir}/usr/bin/${pkgname}-nogui"
+	fi
+
+	# Plugins
+	if [[ "$_build_linkscloud" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/LinksCloud/libLinksCloud.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libLinksCloud.so"
+	fi
+	if [[ "$_build_voip" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/VOIP/libVOIP.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libVOIP.so"
+	fi
+	if [[ "$_build_feedreader" == "true" ]] ; then
+		install -D -m 755 \
+			"${_srcdir}/plugins/FeedReader/libFeedReader.so" \
+			"${pkgdir}/usr/lib/retroshare/extensions/libFeedReader.so"
+	fi
+
+	# Icons
+	install -D -m 644 \
+		"${_srcdir}/retroshare-gui/src/gui/images/retrosharelogo2.png" \
+		"${pkgdir}/usr/share/pixmaps/retroshare.png"
+
+	# Desktop File
+	install -D -m 644 \
+		"${srcdir}/${pkgname}.desktop" \
+		"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+	# bdboot (needed to bootstrap the DHT)
+	install -D -m 644 \
+		"${_srcdir}/libbitdht/src/bitdht/bdboot.txt" \
+		"${pkgdir}/usr/share/RetroShare/bdboot.txt"
+
+	# Skins
+	cp -r "${_srcdir}/retroshare-gui/src/qss" "${pkgdir}/usr/share/RetroShare/"
+	find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \;
+}
diff --git a/pcr/retroshare/retroshare.desktop b/pcr/retroshare/retroshare.desktop
new file mode 100644
index 000000000..0c3f56180
--- /dev/null
+++ b/pcr/retroshare/retroshare.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=RetroShare
+GenericName=Sharing Network
+Comment=Secure Communication with Your Friends
+Icon=/usr/share/pixmaps/retroshare.png
+Exec=/usr/bin/retroshare
+Terminal=false
+StartupNotify=true
+Categories=Network;InstantMessaging;FileTransfer;Chat;Email;
diff --git a/pcr/retroshare/retroshare.install b/pcr/retroshare/retroshare.install
new file mode 100644
index 000000000..e48df1361
--- /dev/null
+++ b/pcr/retroshare/retroshare.install
@@ -0,0 +1,15 @@
+post_install() {
+	# Update Desktop DB
+	if [[ -x /usr/bin/update-desktop-database ]]; then
+		echo "Update desktop database..."
+		update-desktop-database -q ;
+	fi
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/pcr/shocco/PKGBUILD b/pcr/shocco/PKGBUILD
new file mode 100644
index 000000000..32baa6d2d
--- /dev/null
+++ b/pcr/shocco/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname="shocco"
+pkgver=1.0
+pkgdesc="Docco-like documentation generator for POSIX shell"
+url="http://rtomayko.github.com/shocco/"
+license=('custom:MIT')
+
+pkgrel=1
+arch=('any')
+depends=('markdown' 'python2-pygments')
+optdepends=('ronn: builds man pages')
+
+source=("libre://$pkgname-$pkgver.tar.gz")
+md5sums=('edaed31d14a2c16e6303c07e24e7bc9a')
+
+mksource=("git://github.com/rtomayko/shocco.git#tag=${pkgver}")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir/$pkgname"
+  ./configure --prefix="$pkgdir"/usr
+  make -j1
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+  make -j1 install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/pcr/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD
index 22852780c..eba2bb854 100644
--- a/pcr/sipwitch/PKGBUILD
+++ b/pcr/sipwitch/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dan Serban
 # Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=sipwitch
 pkgver=1.2.4
diff --git a/pcr/smtube/PKGBUILD b/pcr/smtube/PKGBUILD
new file mode 100644
index 000000000..d54983bb0
--- /dev/null
+++ b/pcr/smtube/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+pkgname=smtube
+pkgver=1.7
+pkgrel=1
+pkgdesc="Search and download videos from YouTube"
+arch=('i686' 'x86_64')
+url="http://smplayer.sourceforge.net"
+license=('GPL')
+depends=('qt4' 'smplayer')
+source=(http://downloads.sourceforge.net/smplayer/$pkgname-$pkgver.tar.bz2)
+
+md5sums=('d9a954e1b337f0c850dcfc6063255056')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr" DESTDIR="$pkgdir" install
+}
+\ No newline at end of file
diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD
new file mode 100644
index 000000000..fb1229ae4
--- /dev/null
+++ b/pcr/spacenav-daemon/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=spacenav-daemon
+_pkgname=${pkgname%-daemon}
+pkgver=0.5
+pkgrel=3
+pkgdesc="Free Spacenav Daemon is a free alternative to the 3Dconnexion device driver, for their 3D input devices."
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+conflicts=${_pkgname}d
+replaces=${_pkgname}d
+url=http://$_pkgname.sourceforge.net/
+license=GPL2
+depends=libx11
+backup=etc/spnavrc
+source=(
+  http://downloads.sourceforge.net/$_pkgname/${_pkgname}d-$pkgver.tar.gz
+  $_pkgname.service
+  spnavrc
+)
+sha512sums=(
+  908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
+  61397646f7dda23b2cef5168f23e21c017801f156374c7fab7bae650cd3cee0ea173d3cb65ae2f0be580aa399999a388df2d804b9d00c01db430c820dbc60160
+  f97866a77fe9e6bee8df046ad62576a1cdbba26323218cd6336de66e0898f403bb33da12666fe75f00bb9bf078f895e8e7de360196079f83082fc94a23f71728
+)
+
+build() {
+  cd $srcdir/${_pkgname}d-$pkgver
+  ./configure --prefix=$pkgdir/usr
+  make
+}
+
+package() {
+  cd $srcdir/${_pkgname}d-$pkgver
+  make DESTDIR=$pkgdir install
+
+  install -Dm644 $srcdir/$_pkgname.service $pkgdir/usr/lib/systemd/system/$_pkgname.service
+  install -Dm644 $srcdir/spnavrc $pkgdir/etc/spnavrc
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/spacenavd/spacenav.service b/pcr/spacenav-daemon/spacenav.service
index 30e8019e9..30e8019e9 100644
--- a/pcr/spacenavd/spacenav.service
+++ b/pcr/spacenav-daemon/spacenav.service
diff --git a/pcr/spacenav-daemon/spnavrc b/pcr/spacenav-daemon/spnavrc
new file mode 100644
index 000000000..7d19ae03b
--- /dev/null
+++ b/pcr/spacenav-daemon/spnavrc
@@ -0,0 +1,8 @@
+# sensitivity is multiplied with every motion (1.0 normal).
+sensitivity = 1.000
+
+# dead zone; any motion less than this number, is discarded as noise.
+dead-zone = 2
+
+# disable led
+led = 0
diff --git a/pcr/spacenavd/PKGBUILD b/pcr/spacenavd/PKGBUILD
deleted file mode 100644
index cf8a43c32..000000000
--- a/pcr/spacenavd/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Jan Hambrecht <jaham at gmx dot net>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=spacenavd
-pkgver=0.5
-pkgrel=2
-pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://spacenav.sourceforge.net/"
-license=('GPL')
-depends=('libx11')
-backup=('etc/spnavrc')
-source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz
-        spacenavd
-        spacenav.service)
-
-md5sums=('0bb21da5315bd376aa508157a9455aaa'                                                                                                              
-         '27a739300d4de07920879af2d2bdd47f'
-         'b404c8021254636b861651a7a48d17a6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=$pkgdir/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  # for initscript service
-  install -D -m755 $srcdir/spacenavd $pkgdir/etc/rc.d/spacenavd || return 1
-  # for systend service
-  install -D -m755 $srcdir/spacenav.service $pkgdir/usr/lib/systemd/system/spacenav.service || return 1
-}
diff --git a/pcr/spacenavd/spacenavd b/pcr/spacenavd/spacenavd
deleted file mode 100644
index 61946197c..000000000
--- a/pcr/spacenavd/spacenavd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON=/usr/bin/spacenavd
-
-PID=`pidof -o %PPID $DAEMON`
-case "$1" in
-  start)
-    stat_busy "Starting Spacenavigator Daemon"
-    [ -z "$PID" ] && $DAEMON
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon spacenavd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Spacenavigator Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon spacenavd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/pcr/sword/PKGBUILD b/pcr/sword/PKGBUILD
new file mode 100644
index 000000000..78ab4e646
--- /dev/null
+++ b/pcr/sword/PKGBUILD
@@ -0,0 +1,68 @@
+# Maintainer:
+# Contributor: Alexander Rødseth
+# Contributor: Andrea Scarpino
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: TripleE <eric1548@yahoo.com>
+# Contributor: Dominic Tubach
+
+pkgname=sword
+pkgver=1.6.2
+pkgrel=9
+pkgdesc="Library for Bible study programs"
+arch=('x86_64' 'i686')
+url="http://www.crosswire.org/sword/"
+license=('GPL')
+depends=('curl' 'clucene' 'swig')
+makedepends=('cmake')
+backup=('etc/sword.conf')
+source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz"
+        "curl.patch"
+        "multimap.patch")
+sha256sums=('af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9'
+            '3c2676b6dc1d56b08b2532f46af32c54e91ea71ed92a5d7a30ee29ed7ff09124'
+            'ddcde54fbd9b29585c03565bff7891622cb2cc0a6381047d5f566987a7cb1b8c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -p1 -i ../curl.patch
+  patch -p1 -i ../multimap.patch
+
+  [[ -d ../build ]] || mkdir ../build
+  cd ../build
+
+  CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DSWORD_GLOBAL_CONF_DIR=/etc
+  make
+}
+
+package() {
+  cd "$srcdir/build"
+
+  make DESTDIR="$pkgdir" install
+
+  install -d "$pkgdir/usr/lib/sword"
+  mv "$pkgdir"/usr/lib/${pkgver}_icu_* \
+    "$pkgdir/usr/lib/sword/"
+
+  cd "$srcdir/$pkgname-$pkgver/locales.d/"
+  for file in *.conf; do
+    install -Dm644 "$file" \
+      "$pkgdir/usr/share/sword/locales.d/$file"
+  done
+
+  cd ../include
+  install -d "$pkgdir/usr/include/sword"
+  install -Dm644 canon_{catholic{,2},synodalp}.h \
+    "$pkgdir/usr/include/sword"
+
+  cd ../samples
+  install -Dm644 mods.d/globals.conf \
+    "$pkgdir/usr/share/sword/mods.d/globals.conf"
+  install -Dm644 recommended/sword.conf \
+    "$pkgdir/etc/sword.conf"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/sword/curl.patch b/pcr/sword/curl.patch
new file mode 100644
index 000000000..63fd4433c
--- /dev/null
+++ b/pcr/sword/curl.patch
@@ -0,0 +1,22 @@
+diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp
+--- sword-1.6.2.orig/src/mgr/curlftpt.cpp	2011-07-27 00:41:40.000000000 +0200
++++ sword-1.6.2.new/src/mgr/curlftpt.cpp	2011-07-27 00:42:05.000000000 +0200
+@@ -26,7 +26,6 @@
+ #include <fcntl.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
+diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp
+--- sword-1.6.2.orig/src/mgr/curlhttpt.cpp	2011-07-27 00:41:40.000000000 +0200
++++ sword-1.6.2.new/src/mgr/curlhttpt.cpp	2011-07-27 00:42:45.000000000 +0200
+@@ -25,7 +25,6 @@
+ #include <cctype>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
diff --git a/pcr/sword/multimap.patch b/pcr/sword/multimap.patch
new file mode 100644
index 000000000..7957ab2d8
--- /dev/null
+++ b/pcr/sword/multimap.patch
@@ -0,0 +1,39 @@
+--- sword-1.6.2/include/multimapwdef.h	2004-05-04 23:01:39.000000000 +0200
++++ /usr/include/sword/multimapwdef.h	2012-06-02 13:37:47.816457345 +0200
+@@ -7,26 +7,26 @@
+ 
+ // multmap that still lets you use [] to reference FIRST
+ // entry of a key if multiples exist
+-template <class Key, class T, class Compare>
+-class multimapwithdefault : public std::multimap<Key, T, Compare> {
++template < class Key, class T, class Compare >
++class multimapwithdefault : public std::multimap< Key, T, Compare > {
+ public:
+-	typedef std::pair<const Key, T> value_type;
++	typedef std::pair< const Key, T > value_type;
+ 	T& getWithDefault(const Key& k, const T& defaultValue) {
+-		if (find(k) == this->end()) {
+-			insert(value_type(k, defaultValue));
++		if (this->find(k) == this->end()) {
++			this->insert(value_type(k, defaultValue));
+ 		}
+ 		return (*(find(k))).second;
+ 	}
+ 
+ 	T& operator[](const Key& k) {
+-		if (find(k) == this->end()) {
+-			insert(value_type(k, T()));
++		if (this->find(k) == this->end()) {
++			this->insert(value_type(k, T()));
+ 		}
+-		return (*(find(k))).second;
++		return (*(this->find(k))).second;
+ 	}
+ 	bool has(const Key& k, const T &val) const {
+-		typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
+-		typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
++		typename std::multimap< Key, T, Compare >::const_iterator start = this->lower_bound(k);
++		typename std::multimap< Key, T, Compare >::const_iterator end = this->upper_bound(k);
+ 		for (; start!=end; start++) {
+ 			if (start->second == val)
+ 				return true;
diff --git a/pcr/torque/PKGBUILD b/pcr/torque/PKGBUILD
index 5f469fa5f..850aa3b7d 100644
--- a/pcr/torque/PKGBUILD
+++ b/pcr/torque/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=torque
 pkgver=4.2.2
diff --git a/pcr/xf86-input-wizardpen/PKGBUILD b/pcr/xf86-input-wizardpen/PKGBUILD
index 4b40ebea2..dfad17f34 100644
--- a/pcr/xf86-input-wizardpen/PKGBUILD
+++ b/pcr/xf86-input-wizardpen/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=xf86-input-wizardpen
 _pkgname=${pkgname:11}
diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray/PKGBUILD
index 1d4b3436c..e3c0381d8 100644
--- a/pcr/yafaray-git/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=(
-  yafaray-git
-  blender-addon-yafaray-git
+  yafaray
+  blender-addon-yafaray
 )
-_pkgflag=git
-_pkgname=${pkgname[0]%-$_pkgflag}
+_pkgname=${pkgname[0]}
 _bldname=${pkgname[1]::7}
 _gitname=Core
 _addname=${_bldname^}-Exporter
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-_pkgver=1.2
-_bldver=2.66
-_bldep=7
+_pkgdate=20130510
+pkgver=1.5.$_pkgdate
+_srcver=44323def5b3866ff601fd401ef2160b80ced8141 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
+_bldver=2.67
+_bldep=8
 _pyver=3.3
 pkgrel=1
 pkgdesc='A libre software raytracing engine'
@@ -27,7 +27,7 @@ depends=(
   freetype2
   libjpeg
   libxml2
-  'openexr=2.0.0'
+  openexr
 )
 optdepends=(
   'python: Python bindings'
@@ -41,17 +41,17 @@ makedepends=(
   qt4
   swig
 )
-provides=($_pkgname=$_pkgver)
-conflicts=$_pkgname
 source=(
-  git://github.com/YafaRay/$_gitname.$_pkgflag
-  git://github.com/YafaRay/$_addname.$_pkgflag
+  git://github.com/YafaRay/$_gitname.git
+  git://github.com/YafaRay/$_addname.git
 )
 sha512sums=(SKIP SKIP)
 
 prepare() {
   cd $srcdir/$_gitname
 
+  git checkout $_srcver
+
   [[ -d build ]] && rm -r build
   mkdir build
 }
@@ -62,17 +62,17 @@ build() {
   setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
     -DYAF_PY_VERSION=$_pyver\
     -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
-
   setarch $CARCH make
 }
 
-package_yafaray-git() {
+package_yafaray() {
   cd $srcdir/$_gitname/build
   setarch $CARCH make DESTDIR=$pkgdir install
 }
 
-package_blender-addon-yafaray-git() {
+package_blender-addon-yafaray() {
   pkgver=$pkgver.v$_bldver
+  _srcver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 # Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes
   pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)"
   arch=any
   depends=(
@@ -80,24 +80,14 @@ package_blender-addon-yafaray-git() {
     "$_bldname>=$(($_bldep-1)):$_bldver"
     "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
   )
-  optdepends=''
-  provides=(
-    ${pkgname%-$_pkgflag}=$_pkgver.v$_bldver
-    $_pkgname-$_bldname-exporter=$_pkgver.v$_bldver
-    $_pkgname-$_bldname-exporter-$_pkgflag=$pkgver
-  )
-  conflicts=(
-    ${pkgname%-$_pkgflag}
-    $_pkgname-$_bldname-exporter
-    $_pkgname-$_bldname-exporter-$_pkgflag
-  )
-  replaces=$_pkgname-$_bldname-exporter-$_pkgflag
+  optdepends=
 
   cd $srcdir/$_addname
 
   a=/usr/lib
   b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
 
+  git checkout $_srcver
   git checkout-index -a -f --prefix=${b%bin}
 
   install -d $b
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index 236ceca01..bf03b4133 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer:  Jacek Burghardt           <jacek@hebe.us>
 # Maintainer:  Vojtech Aschenbrenner     <v@asch.cz>
 # Contributor: Jason Gardner             <buhrietoe@gmail.com>
 # Contributor: Ross melin                <rdmelin@gmail.com>
@@ -9,12 +10,13 @@
 pkgbase=zoneminder
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=24
+pkgrel=27
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=(
   i686
   x86_64
   mips64el
+  arm
 )
 backup=(
   etc/zm.conf
@@ -26,7 +28,6 @@ license=(
 depends=(
   apache
   cambozola
-  libav-static
   gnutls
   mariadb
   perl-archive-zip
@@ -59,110 +60,67 @@ source=(
   httpd-$pkgbase.conf
   $pkgbase
   $pkgbase.service
+  zoneminder-1.25.0-kernel35.patch
+  zoneminder-1.25.0-gcc47.patch
+  zoneminder-1.25.0-ffmpeg.patch
+  zoneminder-1.25-text.patch
+  zoneminder-1.25-fixwarning.patch
+  zoneminder-1.25.0-gcrypt.patch
 )
 sha512sums=(
   3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375
   4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08
   ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0
   cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
+  4fa79e49a3c04e9fdc9823792c6a28012002479c77ed41637bd2d21f089e4c15592bfcd5c24028f356c9f80d774a5080a6841e8e70a435d607e3089d0b121775
+  3da7d4d21dea166ea12b49e88a05a9f7a75790881a1f2d7588fa9e0e6ce592b4b5ee71994fa8b05236efeeb57890157a622c752c12a9059c2ee915adf3b4660d
+  7fc2a4663c3103bef641be065bd7992a2b3dc0699f1b99dc2fdb34c1c48e58686e490d3ade523ef7c8e29b3f04109658eef652c26ff6ee3fb9aee65453bdb6c4
+  17b85051543c34a41c6b94ec8f46a10927aa4bc9554562650788c8257ffba8e362500cf3641708f2f9dabebc663a2d012fa9feacd7f9b33c637fbc965d405adf
+  8eab0a922968465fee8537dc035ce781e51dc84cc05259a32acb5bf59c618bc1700dbf4eec90717ed5959841def119357974d109df8d7450c12ca4ea8576e55c
+  8c9e7debcaf60be1c2dda656f95e497f6812d704edc3ca4a1c915a3b3c9dc1749c91d96bc2d60db7d90d5edfd9e2dfc39010dfe4feabfecfffd27f1fffc3d675
 )
 
 build() {
   cd $srcdir/ZoneMinder-$pkgver
-
-  # ZM_RUNDIR need change to run dir
-  export CPPFLAGS=-D__STDC_CONSTANT_MACROS\
-    OPT_FFMPEG=yes\
-    PATH_FFMPEG=/usr/bin/avconv-static\
-    ZM_LOGDIR=/var/log/$pkgbase\
-    ZM_RUNDIR=/tmp/$pkgbase\
-    ZM_SSL_LIB=gnutls\
-    ZM_TMPDIR=/tmp/$pkgbase
-
-  # Patch for GCC 4.7.x
-  sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\
-     src/zm_logger.cpp || read
-  sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/'\
-     src/zm_thread.h || read
-
-  # Patch for automake 1.12
-  sed -i -e '/am__api_version=/ s/1.11/1.12/'\
-    configure || read
-
-  # Patch for disable ZM_CHECK_FOR_UPDATES
-  sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for support html5 video and flv
-  sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/;
-    /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for enable video export
-  #sed -i -e '/ZM_OPT_FFMPEG/,+1 s/@OPT_FFMPEG@/yes/;
-  #  /ZM_PATH_FFMPEG/,+1 s/@PATH_FFMPEG@/\/usr\/bin\/avconv-static/'\
-  #  scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for change path run dir
-  sed -i -e '/ZM_PATH_SOCKS/,+1 s/TMP/RUN/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
   # Patch for change ZM name to ZoneMinder
   sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\
     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for v4l2 convert support
-  sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l2convert.so\' ;/"\
-    scripts/zmdc.pl.in || read
-
-  # Patch for add more socket tries
+  sed -i -e '/am__api_version=/ s/1.11/1.13.1/'\
+        configure || read
+    # Patch for add more socket tries
   sed -i -e '/$max_socket_tries/ s/3/15/'\
-    web/ajax/stream.php || read
-
-  # Patch for wrong "suppported"
+      web/ajax/stream.php || read
+   # Patch for support html5 video and flv
+  sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/;
+     /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\
+     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
+   # Patch for wrong "suppported"
   sed -i -e 's/suppported/supported/'\
      src/zm_local_camera.cpp || read
+  
 
-  # Patch for type cast in linux-libre kernel 3.5
-  sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\
-    src/zm_local_camera.cpp || read
-
-  # Patch for drop custom perl install paths
-  sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d;
-    s/^AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")/AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")\n\nEXTRA_PERL_LIB="# Include from system perl paths only"\nPERL_MM_PARMS="INSTALLDIRS=vendor"/'\
-    configure.ac
-
-  # Patch for support ffmpeg with <libavutil/mathematics.h> and C library
-  sed -i -e 's/^extern "C" {/extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>/
-    s/^#include <libavutil\/avutil.h>/#include <libavutil\/avutil.h>\n#include <libavutil\/mathematics.h>/'\
-    src/zm_ffmpeg.h
-  sed -i -e 's/^AM_CONFIG_HEADER(config.h)/AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])/;
-    s/^AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)/AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])/;
-    s/^AC_CHECK_HEADERS(libswscale\/swscale.h,,,)/AC_CHECK_HEADERS(libswscale\/swscale.h,,,)\nAC_LANG_POP([C])/'\
-    configure.ac
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-kernel35.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-gcc47.patch 
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-ffmpeg.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25-text.patch   
+   patch -Np1 -F99 -i ../zoneminder-1.25-fixwarning.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-gcrypt.patch
 
-  # Patch for wrong install run, tmp and log dir
-  sed -i -e '/ install-data-hook/d;/install-data-hook:/d;/# Yes, you are correct. This is a HACK!/d;
-    /	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d;
-    /	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d;
-    /	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d;
-    /	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d'\
-    Makefile.{am,in}
-
-  ./configure --prefix=/usr\
+export CXXFLAGS=-D__STDC_CONSTANT_MACROS
+./configure --prefix=/usr\
     --enable-crashtrace=no\
     --enable-debug=no\
     --enable-mmap=yes\
     --sysconfdir=/etc\
     --with-cgidir=/srv/http/cgi-bin\
     --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\
-    --with-ffmpeg=/opt/libav-static\
     --with-libarch=lib\
+    --with-ffmpeg=/usr \
     --with-mysql=/usr\
     --with-webdir=/srv/http/$pkgbase\
     --with-webgroup=http\
     --with-webhost=localhost\
-    --with-webuser=http
+    --with-webuser=http \
 
   make V=0
 }
@@ -173,8 +131,9 @@ package() {
   make DESTDIR=$pkgdir install
 
   mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgbase},usr/{lib/systemd/system,share/{license/$pkgbase,$pkgbase/db}},var/{cache/$pkgbase,log/$pkgbase}}
-
+  mkdir -p $pkgdir/srv/zoneminder/socks
   chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}}
+  chown -R http.http $pkgdir/srv/zoneminder/socks
   chmod 0700 $pkgdir/etc/zm.conf
 
   for i in events images temp; do
diff --git a/pcr/zoneminder/zoneminder-1.25-fixwarning.patch b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
new file mode 100644
index 000000000..0d151d139
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
@@ -0,0 +1,14 @@
+diff -U 3 -H -d -r -N -- ZoneMinder-1.24.2/src/zm_image.cpp ZoneMinder-1.24.2-patch/src/zm_image.cpp
+--- ZoneMinder-1.24.2/src/zm_image.cpp	2009-05-25 20:04:00.000000000 +0200
++++ ZoneMinder-1.24.2-patch/src/zm_image.cpp	2009-07-04 16:31:45.000000000 +0200
+@@ -776,7 +776,8 @@
+ 
+ 		while( pdest < (buffer+size) )
+ 		{
+-			*pdest++ = (*blend_ptr)[*pdest][*psrc++];
++			*pdest = (*blend_ptr)[*pdest][*psrc++];
++			pdest++;
+ 		}
+ 	}
+ 	else
+
diff --git a/pcr/zoneminder/zoneminder-1.25-text.patch b/pcr/zoneminder/zoneminder-1.25-text.patch
new file mode 100644
index 000000000..90885f1b5
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25-text.patch
@@ -0,0 +1,12 @@
+--- ZoneMinder-1.25.0/src/zm_stream.cpp	2009-05-08 09:47:27.000000000 -0400
++++ ZoneMinder-1.25.0.ajs/src/zm_stream.cpp	2013-01-14 16:52:18.000000000 -0500
+@@ -262,7 +262,7 @@ bool StreamBase::sendTextFrame( const ch
+         fprintf( stdout, "--ZoneMinderFrame\r\n" );
+         fprintf( stdout, "Content-Length: %d\r\n", n_bytes );
+         fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
+-        if ( fwrite( buffer, n_bytes, 1, stdout ) )
++        if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )
+         {
+             Error( "Unable to send stream text frame: %s", strerror(errno) );
+             return( false );
+
diff --git a/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch
new file mode 100644
index 000000000..99d41ee33
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch
@@ -0,0 +1,130 @@
+diff -Naur ZoneMinder-1.25.0-a/configure.ac ZoneMinder-1.25.0-b/configure.ac
+--- ZoneMinder-1.25.0-a/configure.ac	2011-08-23 09:10:32.000000000 -0600
++++ ZoneMinder-1.25.0-b/configure.ac	2013-05-06 11:17:33.860608307 -0600
+@@ -95,7 +95,7 @@
+ 
+ LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
+ CFLAGS="${FFMPEG_CFLAGS} $CFLAGS"
+-CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS"
++CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS -D__STDC_CONSTANT_MACROS"
+ 
+ EXTRA_LIBS=
+ AC_ARG_WITH(extralibs,
+@@ -275,8 +275,7 @@
+ AC_CHECK_LIB(x264,x264_predict_16x16_init)
+ AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+ # Don't bother to warn about this one
+-AC_CHECK_LIB(avcore,av_image_copy,,)
+-AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
++AC_CHECK_LIB(avcodec,avcodec_register_all,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+ AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+ AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
+ AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg.h ZoneMinder-1.25.0-b/src/zm_ffmpeg.h
+--- ZoneMinder-1.25.0-a/src/zm_ffmpeg.h	2011-06-24 10:05:07.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_ffmpeg.h	2013-05-06 18:11:49.327274977 -0600
+@@ -43,6 +43,11 @@
+ }
+ #endif
+ 
++#include <libavutil/avutil.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libswscale/swscale.h>
++
+ #if FFMPEG_VERSION_INT == 0x000408
+ #define ZM_FFMPEG_048	1
+ #elif FFMPEG_VERSION_INT == 0x000409
+diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp
+--- ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp	2011-06-21 01:40:13.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp	2013-05-06 19:57:08.453941643 -0600
+@@ -91,7 +91,7 @@
+     Info( "Priming capture from %s", mPath.c_str() );
+ 
+     // Open the input, not necessarily a file
+-    if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
++    if ( avformat_open_input( &mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )
+         Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
+ 
+     // Locate stream info from input
+@@ -122,7 +122,7 @@
+         Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
+ 
+     // Open the codec
+-    if ( avcodec_open( mCodecContext, mCodec ) < 0 )
++    if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )
+         Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
+ 
+     // Allocate space for the native video frame
+diff -Naur ZoneMinder-1.25.0-a/src/zm_mpeg.cpp ZoneMinder-1.25.0-b/src/zm_mpeg.cpp
+--- ZoneMinder-1.25.0-a/src/zm_mpeg.cpp	2011-05-15 14:39:06.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_mpeg.cpp	2013-05-06 20:00:08.923941640 -0600
+@@ -130,7 +130,7 @@
+ {
+ 	/* set the output parameters (must be done even if no
+ 	   parameters). */
+-	if ( av_set_parameters(ofc, NULL) < 0 )
++	if ( avformat_write_header(ofc, NULL) < 0 )
+ 	{
+ 		Panic( "Invalid output format parameters" );
+ 	}
+@@ -176,7 +176,7 @@
+ 		}
+ 
+ 		/* open the codec */
+-		if ( avcodec_open(c, codec) < 0 )
++		if ( avcodec_open2(c, codec, NULL) < 0 )
+ 		{
+ 			Panic( "Could not open codec" );
+ 		}
+@@ -222,7 +222,7 @@
+ 	if ( !(of->flags & AVFMT_NOFILE) )
+ 	{
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+-		if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )
++		if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
+ #else
+ 		if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
+ #endif
+@@ -241,7 +241,7 @@
+ 	}
+ 
+ 	/* write the stream header, if any */
+-	av_write_header(ofc);
++	avformat_write_header(ofc, NULL);
+ }
+ 
+ VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int width, int height )
+diff -Naur ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp
+--- ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp	2011-06-21 03:19:10.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp	2013-05-06 20:07:40.797274975 -0600
+@@ -145,7 +145,7 @@
+         Panic( "Unable to locate codec %d decoder", codecContext->codec_id );
+ 
+     // Open codec
+-    if ( avcodec_open( codecContext, codec ) < 0 )
++    if ( avcodec_open2( codecContext, codec, NULL ) < 0 )
+         Panic( "Can't open codec" );
+ 
+     picture = avcodec_alloc_frame();
+diff -Naur ZoneMinder-1.25.0-a/src/zm_sdp.h ZoneMinder-1.25.0-b/src/zm_sdp.h
+--- ZoneMinder-1.25.0-a/src/zm_sdp.h	2011-05-15 14:39:06.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_sdp.h	2013-05-06 20:23:28.237274974 -0600
+@@ -41,7 +41,7 @@
+         int payloadType;
+         const char payloadName[6];
+         enum AVMediaType codecType;
+-        enum CodecID codecId;
++        enum AVCodecID codecId;
+         int clockRate;
+         int autoChannels;
+     };
+@@ -50,7 +50,7 @@
+     {
+         const char payloadName[32];
+         enum AVMediaType codecType;
+-        enum CodecID codecId;
++        enum AVCodecID codecId;
+         //int clockRate;
+         //int autoChannels;
+     };
diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch
new file mode 100644
index 000000000..a083c6dbc
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch
@@ -0,0 +1,33 @@
+diff -up ./src/zm_local_camera.cpp.gcc47 ./src/zm_local_camera.cpp
+--- ./src/zm_local_camera.cpp.gcc47	2011-06-21 04:19:10.000000000 -0500
++++ ./src/zm_local_camera.cpp	2012-01-19 13:43:49.142440717 -0600
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+diff -up ./src/zm_logger.cpp.gcc47 ./src/zm_logger.cpp
+--- ./src/zm_logger.cpp.gcc47	2011-06-28 06:07:35.000000000 -0500
++++ ./src/zm_logger.cpp	2012-01-19 13:43:49.142440717 -0600
+@@ -33,6 +33,7 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ bool Logger::smInitialised = false;
+ Logger *Logger::smInstance = 0;
+diff -up ./src/zm_thread.h.gcc47 ./src/zm_thread.h
+--- ./src/zm_thread.h.gcc47	2012-01-19 13:44:43.082766722 -0600
++++ ./src/zm_thread.h	2012-01-19 13:44:56.966335869 -0600
+@@ -21,6 +21,7 @@
+ #define ZM_THREAD_H
+ 
+ #include <pthread.h>
++#include <unistd.h>
+ #include "zm_exception.h"
+ #include "zm_utils.h"
+ 
diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch
new file mode 100644
index 000000000..21f197ec6
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch
@@ -0,0 +1,86 @@
+diff -up ./configure.ac.gcrypt ./configure.ac
+--- ./configure.ac.gcrypt	2012-01-19 12:58:20.647123209 -0600
++++ ./configure.ac	2012-01-19 13:12:34.186669577 -0600
+@@ -13,7 +13,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
+ AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
+ AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
+ AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
+-AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
++AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt])
+ AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default MyISAM])
+ AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
+ AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
+@@ -32,7 +32,7 @@ if test "$ZM_DB_PASS" == ""; then
+ 	AC_SUBST(ZM_DB_PASS,[zmpass])
+ fi
+ if test "$ZM_SSL_LIB" == ""; then
+-	AC_SUBST(ZM_SSL_LIB,gnutls)
++	AC_SUBST(ZM_SSL_LIB,libgcrypt)
+ fi
+ if test "$ZM_MYSQL_ENGINE" == ""; then
+ 	AC_SUBST(ZM_MYSQL_ENGINE,MyISAM)
+@@ -264,11 +264,10 @@ AC_CHECK_LIB(jpeg,jpeg_start_compress,,A
+ AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
+ AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
+ if test "$ZM_SSL_LIB" == "openssl"; then
+-AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
++AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead]))
+ else
+-AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
++AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),)
+ AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+ fi
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(z,zlibVersion)
+@@ -320,9 +319,6 @@ AC_CHECK_DECLS(round,,,[#include <math.h
+ if test "$ZM_SSL_LIB" == "openssl"; then
+ AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
+ #include <openssl/md5.h>])
+-else
+-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
+-#include <gnutls/openssl.h>])
+ fi
+ AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
+ 
+diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp
+--- ./src/zm_user.cpp.gcrypt	2011-08-03 06:31:06.000000000 -0500
++++ ./src/zm_user.cpp	2012-01-19 12:58:20.654122992 -0600
+@@ -140,6 +140,18 @@ User *zmLoadUser( const char *username, 
+ 	return( user );
+ }
+ 
++#ifdef HAVE_GCRYPT_H
++#define HAVE_DECL_MD5 1
++#define MD5_DIGEST_LENGTH 16
++static unsigned char *MD5(const unsigned char *data, unsigned long len,
++                         unsigned char *md)
++{
++    gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len);
++
++    return md;
++}
++#endif
++
+ // Function to validate an authentication string
+ User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
+ {
+diff -up ./src/zm_user.h.gcrypt ./src/zm_user.h
+--- ./src/zm_user.h.gcrypt	2010-11-11 06:11:07.000000000 -0600
++++ ./src/zm_user.h	2012-01-19 13:14:11.200654694 -0600
+@@ -23,14 +23,11 @@
+ #ifndef ZM_USER_H
+ #define ZM_USER_H
+ 
+-#if HAVE_LIBGNUTLS_OPENSSL
+-#include <gnutls/openssl.h>
+ #if HAVE_GCRYPT_H
+ #include <gcrypt.h>
+-#endif // HAVE_GCRYPT_H
+ #elif HAVE_LIBCRYPTO
+ #include <openssl/md5.h>
+-#endif // HAVE_LIBGNUTLS_OPENSSL || HAVE_LIBCRYPTO
++#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
+ 
+ class User
+ {
diff --git a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch
new file mode 100644
index 000000000..51bc1288d
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch
@@ -0,0 +1,21 @@
+diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp
+--- ./src/zm_local_camera.cpp.kernel35	2012-07-16 15:01:22.182614878 -0500
++++ ./src/zm_local_camera.cpp	2012-07-16 15:02:16.491941730 -0500
+@@ -740,7 +740,7 @@ void LocalCamera::Terminate()
+     {
+         Debug( 3, "Terminating video stream" );
+         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-        enum v4l2_buf_type type = v4l2_data.fmt.type;
++        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+         if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 )
+             Error( "Failed to stop capture stream: %s", strerror(errno) );
+ 
+@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture()
+ 
+         Debug( 3, "Starting video stream" );
+         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-        enum v4l2_buf_type type = v4l2_data.fmt.type;
++        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+         if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 )
+             Fatal( "Failed to start capture stream: %s", strerror(errno) );
+     }
diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install
index ecacf6437..899e2a5d1 100644
--- a/pcr/zoneminder/zoneminder.install
+++ b/pcr/zoneminder/zoneminder.install
@@ -69,9 +69,6 @@ post_install() {
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
     /^open_basedir/ s/$/:\/srv\/http\/zoneminder/;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder//;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder\///;
-    /^open_basedir/ s/$/:\/var\/cache\/zoneminder/;
     ' /etc/php/php.ini || read
   sed -i -e '
     /^LoadModule php5_module modules\/libphp5.so/d;
@@ -82,7 +79,6 @@ post_install() {
     /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
     /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/;
     ' /etc/httpd/conf/httpd.conf || read
-  gpasswd -a http video
   cat << EOF
 Note for mysql:
 ==> To run Zoneminder, you must install the database running mysql service (as root):
@@ -109,11 +105,11 @@ Note for php:
 ==> "extension=openssl.so"
 ==> "extension=ftp.so"
 ==> "extension=zip.so"
-==> check and add to open_basedir "/etc", 
-==> "/srv/http/zoneminder" and "/var/cache/zoneminder" like so
-==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder:/var/cache/zoneminder"
+==> check and add to open_basedir "/etc" and
+==> "/srv/http/zoneminder" like so
+==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder"
 ==> and set your timezone in php.ini:
-==> "date.timezone = <your_zone>/<your_city>"
+==> "date.timezone = <your_country>/<your_city>"
 
 Note for apache:
 ==> You must edit /etc/httpd/conf/httpd.conf and add the line:
@@ -136,7 +132,6 @@ post_remove() {
   sed -i -e '
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder\///
     ' /etc/php/php.ini || read
   sed -i -e '
     /^# ZoneMinder/d;
@@ -170,12 +165,9 @@ Note:
 ==> "extension=mysqli.so"
 ==> "extension=session.so"
 ==> "extension=sockets.so"
-==> "date.timezone = <my_zone>/<my_city>"
+==> "date.timezone = <my_country>/<my_city>"
 
-==> Drop http user on video group if it isn't needed with others servers:
-==> gpasswd -d http video
-
-==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder"
+==> Edit /etc/php/php.ini and remove "/etc" and "/srv/http/zoneminder"
 ==> in the "open_basedir".
 
 ==> Remove log files and "zonemider" directory in "/var/log/zoneminder".
author	Nicolás Reynolds <fauno@parabola.nu>	2013-07-03 10:33:32 -0300
committer	Nicolás Reynolds <fauno@parabola.nu>	2013-07-03 10:33:32 -0300
commit	8647aee53c2f9f5458e57fe7ac212da40a555594 (patch)
tree	b99a8fbc859d18a244ea5ac496083e66ffaa330d /pcr
parent	3a14409a347f3423bf2a4ab847edff625b671e20 (diff)
parent	0a5c7083d197551290bc762f4ba90210cb733a5e (diff)