146 files changed, 631 insertions, 282 deletions

diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 7707a44ca..84a983d9b 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apr-util
-pkgver=1.3.11
+pkgver=1.3.12
 pkgrel=0
 pkgdesc="The Apache Portable Runtime Utility Library"
 url="http://apr.apache.org/"
@@ -53,4 +53,4 @@ dbd_mysql() { _mv_mod dbd_mysql "MySQL"; }
 dbd_sqlite3() { _mv_mod dbd_sqlite "SQLite3"; }
 ldap() { _mv_mod ldap "LDAP"; }
 
-md5sums="2aeddb384b03f3f73107770724d5c97b  apr-util-1.3.11.tar.bz2"
+md5sums="0f671b037ca62751a8a7005578085560  apr-util-1.3.12.tar.bz2"
diff --git a/main/apr/APKBUILD b/main/apr/APKBUILD
index 5460624a8..bc6daaf9a 100644
--- a/main/apr/APKBUILD
+++ b/main/apr/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apr
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=0
 pkgdesc="The Apache Portable Runtime"
 url="http://apr.apache.org/"
@@ -45,4 +45,4 @@ dev() {
 	return 0
 }
 
-md5sums="daf5487c82dd7bec9c005c96f8cb01b1  apr-1.4.4.tar.bz2"
+md5sums="8b53f5a5669d0597f2da889a2f576eb6  apr-1.4.5.tar.bz2"
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index 5f97d1c32..89ea14bc4 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ccache
-pkgver=3.1.4
+pkgver=3.1.5
 pkgrel=0
 pkgdesc="ccache is a compiler cache"
 url="http://ccache.samba.org/"
@@ -34,4 +34,4 @@ package() {
 	ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/${CHOST}-cpp
 	ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/${CHOST}-c++
 }
-md5sums="d43a8fbe83767978098ba7f8ee25d3d1  ccache-3.1.4.tar.gz"
+md5sums="b1a9684828eae68382d6afc98ce80d24  ccache-3.1.5.tar.gz"
diff --git a/main/consolekit/APKBUILD b/main/consolekit/APKBUILD
index dfda9d30a..a76e1a3c7 100644
--- a/main/consolekit/APKBUILD
+++ b/main/consolekit/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=consolekit
-pkgver=0.4.4
-pkgrel=2
+pkgver=0.4.5
+pkgrel=0
 pkgdesc="Framework for defining and tracking users, login sessions, and seats"
 url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
 arch="all"
@@ -45,6 +45,6 @@ package() {
 		"$pkgdir"/usr/lib/ConsoleKit/run-session.d/
 }
 
-md5sums="b57eb18eae8c4d3631d5f4f030218a29  ConsoleKit-0.4.4.tar.bz2
+md5sums="f2657f93761206922d558471a936fbc3  ConsoleKit-0.4.5.tar.bz2
 acc4f44190cd677f95fd529d528c9cef  0001-busybox-reboot-and-poweroff-support.patch
 d75ed3438dab01552304c06fd9a967b1  pam-foreground-compat.ck"
diff --git a/main/epdfview/350-coordinates.patch b/main/epdfview/350-coordinates.patch
deleted file mode 100644
index 39fe67354..000000000
--- a/main/epdfview/350-coordinates.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/PDFDocument.cxx
-===================================================================
---- src/PDFDocument.cxx	(revision 349)
-+++ src/PDFDocument.cxx	(revision 350)
-@@ -683,7 +683,7 @@
-     //for get text we must exchange y coordinate, don't ask me where logic here.
-     PopplerRectangle textRect = { rect->getX1() / getZoom(),
-                                   (pageHeight - rect->getY2() / getZoom()),
--                                  rect->getX2() * getZoom() / getZoom(),
-+                                  rect->getX2() / getZoom(),
-                                   (pageHeight - rect->getY1() / getZoom())};
-     repairEmpty(textRect);
- 
diff --git a/main/epdfview/351-memleak.patch b/main/epdfview/351-memleak.patch
deleted file mode 100644
index 097a06a8a..000000000
--- a/main/epdfview/351-memleak.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: src/PDFDocument.cxx
-===================================================================
---- src/PDFDocument.cxx	(revision 350)
-+++ src/PDFDocument.cxx	(revision 351)
-@@ -167,6 +167,7 @@
-                                        (height - matchRect->y1));
-             results = g_list_prepend (results, rect);
-         }
-+        g_object_unref (G_OBJECT (page));
-     }
- 
-     return g_list_reverse (results);
-Index: THANKS
-===================================================================
---- THANKS	(revision 350)
-+++ THANKS	(revision 351)
-@@ -16,6 +16,7 @@
-     - Fridrich Strba <fridrich.strba@bluewin.ch>, for his Windows patch.
-     - Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, for his vim keybindings patch.
-     - Igor Vagulin <igor_vagulin@mail.ru>, for his Russian translation and patches.
-+    - Jim Ramsay <i.am@jimramsay.com>, for his patches.
-     - Lester Godwin <lgodwin@pushcorp.com>, for his patches.
-     - LoneFox <>, for his patches.
-     - Michael Opitz <opitz.michael@gmail.com>, for his patches.
diff --git a/main/epdfview/354-poppler-0.15.patch b/main/epdfview/354-poppler-0.15.patch
deleted file mode 100644
index 1c7880ac0..000000000
--- a/main/epdfview/354-poppler-0.15.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Support for poppler >= 0.15.0
-
-Poppler 0.15 has an API change. See:
-http://cgit.freedesktop.org/poppler/poppler/commit/?id=b257428150e2c13dcc24fd8f75e4ee2c679ab414
-This adds support for the new poppler version to epdfview.
-Tested in Fedora Rawhide.
-
-[ Patch sent to Jordi Fita on 2010-10-01 -- michich ]
-
-Index: src/PDFDocument.cxx
-===================================================================
---- src/PDFDocument.cxx	(revision 353)
-+++ src/PDFDocument.cxx	(working copy)
-@@ -681,14 +681,24 @@
-     gdouble pageWidth, pageHeight;
-     poppler_page_get_size(page, &pageWidth, &pageHeight);
- 
-+#if defined (HAVE_POPPLER_0_15_0)
-+    PopplerRectangle textRect = { rect->getX1() / getZoom(),
-+                                  rect->getY1() / getZoom(),
-+                                  rect->getX2() / getZoom(),
-+                                  rect->getY2() / getZoom()};
-+#else // !HAVE_POPPLER_0_15_0
-     //for get text we must exchange y coordinate, don't ask me where logic here.
-     PopplerRectangle textRect = { rect->getX1() / getZoom(),
-                                   (pageHeight - rect->getY2() / getZoom()),
-                                   rect->getX2() / getZoom(),
-                                   (pageHeight - rect->getY1() / getZoom())};
-+#endif // HAVE_POPPLER_0_15_0
-     repairEmpty(textRect);
- 
--#if defined (HAVE_POPPLER_0_6_0)
-+#if defined (HAVE_POPPLER_0_15_0)
-+    gchar *text = poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH,
-+            &textRect);
-+#elif defined (HAVE_POPPLER_0_6_0)
-     gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH,
-             &textRect);
- #else // !HAVE_POPPLER_0_6_0
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 353)
-+++ configure.ac	(working copy)
-@@ -41,18 +41,22 @@
- AC_SUBST([POPPLER_CFLAGS])
- AC_SUBST([POPPLER_LIBS])
- dnl Check if we have poppler version 0.5.2 or higher.
--PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_052=yes])
--if test "x$have_poppler_052" = "xyes"; then
-+PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_0_5_2=yes])
-+if test "x$have_poppler_0_5_2" = "xyes"; then
-     AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
- fi
--PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes])
--if test "x$have_poppler_060" = "xyes"; then
-+PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_0_6_0=yes])
-+if test "x$have_poppler_0_6_0" = "xyes"; then
-     AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
- fi
--PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes])
--if test "x$have_poppler_080" = "xyes"; then
-+PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_0_8_0=yes])
-+if test "x$have_poppler_0_8_0" = "xyes"; then
-     AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.])
- fi
-+PKG_CHECK_EXISTS([poppler-glib >= 0.15], [have_poppler_0_15_0=yes])
-+if test "x$have_poppler_0_15_0" = "xyes"; then
-+    AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
-+fi
- 
- AC_MSG_CHECKING([for native Win32])
- case "$host" in
diff --git a/main/epdfview/APKBUILD b/main/epdfview/APKBUILD
index b7284b130..4a2ad979b 100644
--- a/main/epdfview/APKBUILD
+++ b/main/epdfview/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=epdfview
-pkgver=0.1.7
-pkgrel=5
+pkgver=0.1.8
+pkgrel=0
 pkgdesc="A free lightweight PDF document viewer."
 url="http://www.emma-soft.com/projects/epdfview/"
 arch="all"
@@ -10,10 +10,6 @@ depends="desktop-file-utils hicolor-icon-theme"
 makedepends="poppler-gtk-dev cups-dev autoconf automake"
 source="http://www.emma-soft.com/projects/$pkgname/chrome/site/releases/$pkgname-$pkgver.tar.bz2
 	$pkgname.desktop.patch
-	fix-scrolling.patch
-	350-coordinates.patch
-	351-memleak.patch
-	354-poppler-0.15.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -56,9 +52,5 @@ package() {
 		"$pkgdir"/usr/share/icons/hicolor/48x48/apps/epdfview.png
 }
 
-md5sums="1919bb19c16ef0a97d48b0a8303d3c7b  epdfview-0.1.7.tar.bz2
-fbf22bbabdbb7544db615ac5775d57e2  epdfview.desktop.patch
-7a1574e0a8d0bcde316050629fb7bedd  fix-scrolling.patch
-8cb4bc10e91afdb0651df12fa83408d7  350-coordinates.patch
-b6595810d47ef70ef6ca87a7de89c117  351-memleak.patch
-3718789a62e1d1ce9bb3dec756609df6  354-poppler-0.15.patch"
+md5sums="e50285b01612169b2594fea375f53ae4  epdfview-0.1.8.tar.bz2
+fbf22bbabdbb7544db615ac5775d57e2  epdfview.desktop.patch"
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 62e19ce61..a06711ec2 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch
-pkgver=1.0.7_p20110527
+pkgver=1.0.7_p20110602
 _ver=${pkgver%_p*}
 _snapshot=${pkgver#*_p}
 pkgrel=0
@@ -127,7 +127,7 @@ conf() {
 	mkdir -p "$pkgdir"/etc/freeswitch/scripts
 }
 
-md5sums="a45f97bd27105862cb30463ad551b24b  freeswitch-1.0.7_p20110527.tar.gz
+md5sums="813edb2192d1cc0fe224d9ef0492de4f  freeswitch-1.0.7_p20110602.tar.gz
 11883affe0839a8e15fe680aeb11b86e  freeswitch-mod_shout-textrels.patch
 691fa3aca967203848bbb2a617545265  modules.conf
 c608cca8ad773acebf201f581438c7e7  freeswitch.confd
diff --git a/testing/gparted/APKBUILD b/main/gparted/APKBUILD
index aa344d8cf..35b98acdb 100644
--- a/testing/gparted/APKBUILD
+++ b/main/gparted/APKBUILD
@@ -1,15 +1,13 @@
-# Contributor: 
-# Maintainer: 
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gparted
 pkgver=0.8.1
-pkgrel=0
+pkgrel=1
 pkgdesc="a graphical partition editor for creating, reorganizing, and deleting disk partitions"
 url="http://gparted.sourceforge.net/"
 arch="all"
 license="GPL"
-depends=
+depends="e2fsprogs"
 makedepends="gtkmm-dev parted-dev util-linux-ng-dev"
-#gnome-doc-utils py-libxml2"
 install=
 subpackages="$pkgname-doc"
 source="http://sourceforge.net/projects/gparted/files/gparted/gparted-$pkgver/gparted-$pkgver.tar.bz2"
diff --git a/main/libssh/APKBUILD b/main/libssh/APKBUILD
index e3bcbb3fa..51260bf43 100644
--- a/main/libssh/APKBUILD
+++ b/main/libssh/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter
 # Maintainer: 
 pkgname=libssh
-pkgver=0.4.8
+pkgver=0.5.0
 pkgrel=0
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
@@ -10,7 +10,7 @@ license="LGPL"
 depends=
 makedepends="openssl-dev cmake doxygen"
 subpackages="$pkgname-dev"
-source="http://www.libssh.org/files/${pkgname}-${pkgver}.tar.gz"
+source="http://www.libssh.org/files/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="d97b3feea1abe047ca8cf86d06e4b789  libssh-0.4.8.tar.gz"
+md5sums="9b37f45751c0ae7ba66099c1fb136946  libssh-0.5.0.tar.gz"
diff --git a/main/libwnck/APKBUILD b/main/libwnck/APKBUILD
index e48d923c4..27273722c 100644
--- a/main/libwnck/APKBUILD
+++ b/main/libwnck/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libwnck
 pkgver=2.30.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Window Navigator Construction Kit"
 url="http://www.gnome.org/"
 arch="all"
diff --git a/main/libxfce4ui/APKBUILD b/main/libxfce4ui/APKBUILD
index 2c0e979cf..6626d681f 100644
--- a/main/libxfce4ui/APKBUILD
+++ b/main/libxfce4ui/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxfce4ui
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Widgets library for the Xfce desktop environment"
 url="http://www.xfce.org/"
 arch="all"
diff --git a/main/libxfcegui4/APKBUILD b/main/libxfcegui4/APKBUILD
index 7a280d036..e501b10fe 100644
--- a/main/libxfcegui4/APKBUILD
+++ b/main/libxfcegui4/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxfcegui4
 pkgver=4.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Basic GUI functions for Xfce"
 url="http://www.xfce.org/"
 arch="all"
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index 7eafa5d49..b59cc857a 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -11,7 +11,7 @@ else
 	_kernver=${pkgver%.*}
 fi
 
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with vserver"
 url="http://linux-vserver.org/"
 depends="mkinitfs linux-firmware"
@@ -76,8 +76,8 @@ package() {
 		INSTALL_PATH="$pkgdir"/boot \
 		|| return 1
 
-	rm -f "$pkgdir"/lib/modules/${_abi_release}/build \
-		"$pkgdir"/lib/modules/${_abi_release}/source
+	rm -rf "$pkgdir"/lib/modules/*/build \
+		"$pkgdir"/lib/modules/*/source
 	rm -rf "$pkgdir"/lib/firmware
 
 	install -D include/config/kernel.release \
diff --git a/main/nspr/APKBUILD b/main/nspr/APKBUILD
index f323f2aac..c34ddf914 100644
--- a/main/nspr/APKBUILD
+++ b/main/nspr/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nspr
-pkgver=4.8.7
+pkgver=4.8.8
 pkgrel=0
 pkgdesc="Netscape Portable Runtime"
 url="http://www.mozilla.org/projects/nspr/"
@@ -66,7 +66,7 @@ package() {
 		"$pkgdir"/usr/include/nspr/md
 }
 
-md5sums="97e30989a56ab813453b71261849c200  nspr-4.8.7.tar.gz
+md5sums="b3a961d2e0ff3331745220984c70b6a9  nspr-4.8.8.tar.gz
 c48e1f47799c1cff7e3bf46dc0e653f1  nspr-4.7.0-prtime.patch
 5c9f15c65561af93ff5e148d8b64e212  nspr-4.8-sonames.patch
 c790c638a7c9fd1d731272f464f065c6  nspr-4.8-config.patch
diff --git a/main/nss/APKBUILD b/main/nss/APKBUILD
index 1270fdfa5..d50a28e02 100644
--- a/main/nss/APKBUILD
+++ b/main/nss/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nss
-pkgver=3.12.9
+pkgver=3.12.10
 _ver=${pkgver//./_}
 pkgrel=0
 pkgdesc="Mozilla Network Security Services"
@@ -137,7 +137,7 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="bd32f183ca28440c1744650be31a9ccc  nss-3.12.9.tar.gz
+md5sums="027954e894f02732f4e66cd854261145  nss-3.12.10.tar.gz
 e5c97db0c884d5f4cfda21e562dc9bba  nss-no-rpath.patch
 c547b030c57fe1ed8b77c73bf52b3ded  nss.pc.in
 46bee81908f1e5b26d6a7a2e14c64d9f  nss-config.in
diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD
new file mode 100644
index 000000000..2ecd0e84b
--- /dev/null
+++ b/main/open-vm-tools-vserver/APKBUILD
@@ -0,0 +1,63 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
+_flavor=vserver
+_realname=open-vm-tools
+_realver=2011.04.25
+_realsubver=402641
+
+# source the kernel version
+if [ -f ../../main/linux-${_flavor}/APKBUILD ]; then
+        . ../../main/linux-${_flavor}/APKBUILD
+fi
+
+_kver=$pkgver
+_kernelver="$pkgver-r$pkgrel"
+_kpkgrel=$pkgrel
+pkgname="$_realname-$_flavor"
+pkgver=$_kver
+_mypkgrel=0
+pkgrel=$(($_kpkgrel + $_mypkgrel))
+
+pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
+url="http://open-vm-tools.sourceforge.net/"
+arch="all"
+license="LGPL"
+subpackages=""
+depends="linux-${_flavor}=${_kernelver}"
+makedepends="glib-dev gettext-dev linux-${_flavor}-dev=${_kernelver}"
+source="http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$_realver-$_realsubver.tar.gz
+	vmware-modules.initd
+	"
+
+_builddir="$srcdir/$_realname-$_realver-$_realsubver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --without-pam \
+		--without-x \
+		--without-dnet \
+		--without-icu \
+		--without-procps \
+		--with-kernel-release="${_abi_release}" \
+		|| return 1
+	cd "$_builddir"/modules
+	make -j1 modules || return 1
+}
+
+package() {
+	cd "$_builddir"
+ 	install -D -m755 "$srcdir"/vmware-modules.initd \
+		"$pkgdir"/etc/init.d/vmware-modules || return 1
+	mkdir -p $pkgdir/lib/modules/"${_abi_release}"/misc/
+	cd "$_builddir"/modules
+	for module in `find -type f -name '*.ko'`; do
+		install -D -m644 $module "$pkgdir/lib/modules/"${_abi_release}"/misc/"
+	done
+}
+
+md5sums="f6d87599523de31f02aaf229bf2ff08c  open-vm-tools-2011.04.25-402641.tar.gz
+afba2c3487d0b12cee80eb2f04b05ba1  vmware-modules.initd"
diff --git a/main/open-vm-tools-vserver/vmware-modules.initd b/main/open-vm-tools-vserver/vmware-modules.initd
new file mode 100644
index 000000000..942f4504e
--- /dev/null
+++ b/main/open-vm-tools-vserver/vmware-modules.initd
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+
+MODULES="vmblock vmci vmhgfs vmsync vmxnet vsock vmw_balloon"
+
+depend() {
+        before open-vm-tools
+}
+
+
+start() {
+        ebegin "Loading VMware kernel modules"
+        for mod in $MODULES; do
+		modprobe -q $mod
+	done
+	eend $?
+}
+
+stop() {
+        ebegin "Unloading VMware kernel modules"
+        for mod in $MODULES; do
+		rmmod $mod
+	done
+        eend $?
+}
+
diff --git a/testing/perl-apache-session/APKBUILD b/main/perl-apache-session/APKBUILD
index 2cdf99a1b..2cdf99a1b 100644
--- a/testing/perl-apache-session/APKBUILD
+++ b/main/perl-apache-session/APKBUILD
diff --git a/testing/perl-astro-suntime/APKBUILD b/main/perl-astro-suntime/APKBUILD
index 9d31915a4..029c6c4f0 100644
--- a/testing/perl-astro-suntime/APKBUILD
+++ b/main/perl-astro-suntime/APKBUILD
@@ -3,13 +3,13 @@
 pkgname=perl-astro-suntime
 _realname=Astro-SunTime
 pkgver=0.01
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides a function interface to calculate sun rise/set times."
 url="http://search.cpan.org/dist/Astro-SunTime/"
 arch="noarch"
 license="GPL PerlArtistic"
 depends="perl"
-makedepends="perl-dev perl-time-parsedate"
+makedepends="perl-dev perl-time-modules"
 install=
 subpackages=""
 source="http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/$_realname-$pkgver.tar.gz"
@@ -19,7 +19,7 @@ _builddir="$srcdir/$_realname-$pkgver"
 build() {
 	cd $_builddir
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-cache-cache/APKBUILD b/main/perl-cache-cache/APKBUILD
index b06d6eb7f..b06d6eb7f 100644
--- a/testing/perl-cache-cache/APKBUILD
+++ b/main/perl-cache-cache/APKBUILD
diff --git a/testing/perl-cache-simple-timedexpiry/APKBUILD b/main/perl-cache-simple-timedexpiry/APKBUILD
index 7d4018a86..7d4018a86 100644
--- a/testing/perl-cache-simple-timedexpiry/APKBUILD
+++ b/main/perl-cache-simple-timedexpiry/APKBUILD
diff --git a/testing/perl-cgi-emulate-psgi/APKBUILD b/main/perl-cgi-emulate-psgi/APKBUILD
index db6e7f212..db6e7f212 100644
--- a/testing/perl-cgi-emulate-psgi/APKBUILD
+++ b/main/perl-cgi-emulate-psgi/APKBUILD
diff --git a/testing/perl-cgi-psgi/APKBUILD b/main/perl-cgi-psgi/APKBUILD
index d00f1c18d..d00f1c18d 100644
--- a/testing/perl-cgi-psgi/APKBUILD
+++ b/main/perl-cgi-psgi/APKBUILD
diff --git a/testing/perl-class-accessor-chained/APKBUILD b/main/perl-class-accessor-chained/APKBUILD
index d4b641996..d4b641996 100644
--- a/testing/perl-class-accessor-chained/APKBUILD
+++ b/main/perl-class-accessor-chained/APKBUILD
diff --git a/testing/perl-class-accessor-lite/APKBUILD b/main/perl-class-accessor-lite/APKBUILD
index 6775c7335..6775c7335 100644
--- a/testing/perl-class-accessor-lite/APKBUILD
+++ b/main/perl-class-accessor-lite/APKBUILD
diff --git a/testing/perl-class-accessor/APKBUILD b/main/perl-class-accessor/APKBUILD
index bbe0e6916..bbe0e6916 100644
--- a/testing/perl-class-accessor/APKBUILD
+++ b/main/perl-class-accessor/APKBUILD
diff --git a/testing/perl-class-container/APKBUILD b/main/perl-class-container/APKBUILD
index 2254ad500..2254ad500 100644
--- a/testing/perl-class-container/APKBUILD
+++ b/main/perl-class-container/APKBUILD
diff --git a/testing/perl-class-data-inheritable/APKBUILD b/main/perl-class-data-inheritable/APKBUILD
index 4494b39bf..4494b39bf 100644
--- a/testing/perl-class-data-inheritable/APKBUILD
+++ b/main/perl-class-data-inheritable/APKBUILD
diff --git a/testing/perl-class-inspector/APKBUILD b/main/perl-class-inspector/APKBUILD
index f29ea6c23..f29ea6c23 100644
--- a/testing/perl-class-inspector/APKBUILD
+++ b/main/perl-class-inspector/APKBUILD
diff --git a/testing/perl-class-load/APKBUILD b/main/perl-class-load/APKBUILD
index 0591ca776..0591ca776 100644
--- a/testing/perl-class-load/APKBUILD
+++ b/main/perl-class-load/APKBUILD
diff --git a/testing/perl-class-returnvalue/APKBUILD b/main/perl-class-returnvalue/APKBUILD
index 58da67941..58da67941 100644
--- a/testing/perl-class-returnvalue/APKBUILD
+++ b/main/perl-class-returnvalue/APKBUILD
diff --git a/testing/perl-class-singleton/APKBUILD b/main/perl-class-singleton/APKBUILD
index 3305f058b..3305f058b 100644
--- a/testing/perl-class-singleton/APKBUILD
+++ b/main/perl-class-singleton/APKBUILD
diff --git a/testing/perl-clone/APKBUILD b/main/perl-clone/APKBUILD
index c7233a2bb..c7233a2bb 100644
--- a/testing/perl-clone/APKBUILD
+++ b/main/perl-clone/APKBUILD
diff --git a/testing/perl-control-x10/APKBUILD b/main/perl-control-x10/APKBUILD
index 8a6be23a8..094b46563 100644
--- a/testing/perl-control-x10/APKBUILD
+++ b/main/perl-control-x10/APKBUILD
@@ -17,7 +17,7 @@ _builddir="$srcdir/$_realname-$pkgver"
 build() {
 	cd $_builddir
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 package() {
 	cd $_builddir
diff --git a/testing/perl-convert-color/APKBUILD b/main/perl-convert-color/APKBUILD
index 7dcb373b3..7dcb373b3 100644
--- a/testing/perl-convert-color/APKBUILD
+++ b/main/perl-convert-color/APKBUILD
diff --git a/testing/perl-css-squish/APKBUILD b/main/perl-css-squish/APKBUILD
index d599cd688..d599cd688 100644
--- a/testing/perl-css-squish/APKBUILD
+++ b/main/perl-css-squish/APKBUILD
diff --git a/testing/perl-data-ical/APKBUILD b/main/perl-data-ical/APKBUILD
index 0286f1ace..0286f1ace 100644
--- a/testing/perl-data-ical/APKBUILD
+++ b/main/perl-data-ical/APKBUILD
diff --git a/testing/perl-data-optlist/APKBUILD b/main/perl-data-optlist/APKBUILD
index 573b3c51e..573b3c51e 100644
--- a/testing/perl-data-optlist/APKBUILD
+++ b/main/perl-data-optlist/APKBUILD
diff --git a/testing/perl-datetime-format-mail/APKBUILD b/main/perl-datetime-format-mail/APKBUILD
index f5c3edef0..f5c3edef0 100644
--- a/testing/perl-datetime-format-mail/APKBUILD
+++ b/main/perl-datetime-format-mail/APKBUILD
diff --git a/testing/perl-datetime-format-w3cdtf/APKBUILD b/main/perl-datetime-format-w3cdtf/APKBUILD
index a9acf1839..a9acf1839 100644
--- a/testing/perl-datetime-format-w3cdtf/APKBUILD
+++ b/main/perl-datetime-format-w3cdtf/APKBUILD
diff --git a/testing/perl-datetime-locale/APKBUILD b/main/perl-datetime-locale/APKBUILD
index b85e2bace..b85e2bace 100644
--- a/testing/perl-datetime-locale/APKBUILD
+++ b/main/perl-datetime-locale/APKBUILD
diff --git a/testing/perl-datetime-timezone/APKBUILD b/main/perl-datetime-timezone/APKBUILD
index 0f1647a80..0f1647a80 100644
--- a/testing/perl-datetime-timezone/APKBUILD
+++ b/main/perl-datetime-timezone/APKBUILD
diff --git a/testing/perl-datetime/APKBUILD b/main/perl-datetime/APKBUILD
index 6410ab936..6410ab936 100644
--- a/testing/perl-datetime/APKBUILD
+++ b/main/perl-datetime/APKBUILD
diff --git a/testing/perl-dbix-dbschema/APKBUILD b/main/perl-dbix-dbschema/APKBUILD
index c5b8717d8..c5b8717d8 100644
--- a/testing/perl-dbix-dbschema/APKBUILD
+++ b/main/perl-dbix-dbschema/APKBUILD
diff --git a/testing/perl-dbix-searchbuilder/APKBUILD b/main/perl-dbix-searchbuilder/APKBUILD
index c1577981a..c1577981a 100644
--- a/testing/perl-dbix-searchbuilder/APKBUILD
+++ b/main/perl-dbix-searchbuilder/APKBUILD
diff --git a/testing/perl-devel-globaldestruction/APKBUILD b/main/perl-devel-globaldestruction/APKBUILD
index e2ffb543e..e2ffb543e 100644
--- a/testing/perl-devel-globaldestruction/APKBUILD
+++ b/main/perl-devel-globaldestruction/APKBUILD
diff --git a/testing/perl-devel-stacktrace-ashtml/APKBUILD b/main/perl-devel-stacktrace-ashtml/APKBUILD
index 077c6a7cb..077c6a7cb 100644
--- a/testing/perl-devel-stacktrace-ashtml/APKBUILD
+++ b/main/perl-devel-stacktrace-ashtml/APKBUILD
diff --git a/testing/perl-devel-stacktrace/APKBUILD b/main/perl-devel-stacktrace/APKBUILD
index 6e4ce6df1..6e4ce6df1 100644
--- a/testing/perl-devel-stacktrace/APKBUILD
+++ b/main/perl-devel-stacktrace/APKBUILD
diff --git a/testing/perl-email-address/APKBUILD b/main/perl-email-address/APKBUILD
index de4c82799..d35e7a595 100644
--- a/testing/perl-email-address/APKBUILD
+++ b/main/perl-email-address/APKBUILD
@@ -27,7 +27,7 @@ prepare() {
 build() {
 	cd "$_builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/main/perl-email-date-format/APKBUILD b/main/perl-email-date-format/APKBUILD
new file mode 100644
index 000000000..b35b77ca5
--- /dev/null
+++ b/main/perl-email-date-format/APKBUILD
@@ -0,0 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 1
+# Contributor: 
+# Maintainer: 
+pkgname=perl-email-date-format
+_pkgreal=Email-Date-Format
+pkgver=1.002
+pkgrel=0
+pkgdesc="produce RFC 8822 date strings"
+url="http://search.cpan.org/dist/Email-Date-Format/"
+arch="noarch"
+license="GPL PerlArtistic"
+cpandepends=""
+cpanmakedepends=""
+depends="$cpandepends"
+makedepends="perl-dev $cpanmakedepends"
+subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_pkgreal-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+}
+
+build() {
+	cd "$_builddir"
+	make && make test
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+md5sums="7ae25275da6ab272aa8b40141eac9f82  Email-Date-Format-1.002.tar.gz"
diff --git a/testing/perl-exception-class/APKBUILD b/main/perl-exception-class/APKBUILD
index 2bedac2a5..2bedac2a5 100644
--- a/testing/perl-exception-class/APKBUILD
+++ b/main/perl-exception-class/APKBUILD
diff --git a/testing/perl-extutils-cchecker/APKBUILD b/main/perl-extutils-cchecker/APKBUILD
index 85b5ef9b6..85b5ef9b6 100644
--- a/testing/perl-extutils-cchecker/APKBUILD
+++ b/main/perl-extutils-cchecker/APKBUILD
diff --git a/testing/perl-fcgi-procmanager/APKBUILD b/main/perl-fcgi-procmanager/APKBUILD
index 6b58e6c87..6b58e6c87 100644
--- a/testing/perl-fcgi-procmanager/APKBUILD
+++ b/main/perl-fcgi-procmanager/APKBUILD
diff --git a/testing/perl-fcgi/APKBUILD b/main/perl-fcgi/APKBUILD
index 59edda625..cb8f256b8 100644
--- a/testing/perl-fcgi/APKBUILD
+++ b/main/perl-fcgi/APKBUILD
@@ -18,7 +18,7 @@ _builddir="$srcdir/$_realname-$pkgver"
 build() {
 	cd "$_builddir"
         PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-file-sharedir/APKBUILD b/main/perl-file-sharedir/APKBUILD
index 3954aff80..3954aff80 100644
--- a/testing/perl-file-sharedir/APKBUILD
+++ b/main/perl-file-sharedir/APKBUILD
diff --git a/testing/perl-file-slurp/APKBUILD b/main/perl-file-slurp/APKBUILD
index 42f222bad..3a4abff3d 100644
--- a/testing/perl-file-slurp/APKBUILD
+++ b/main/perl-file-slurp/APKBUILD
@@ -25,7 +25,7 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	make
+	make && make test
 }
 
 package() {
diff --git a/testing/perl-filesys-notify-simple/APKBUILD b/main/perl-filesys-notify-simple/APKBUILD
index 77ae55a36..77ae55a36 100644
--- a/testing/perl-filesys-notify-simple/APKBUILD
+++ b/main/perl-filesys-notify-simple/APKBUILD
diff --git a/testing/perl-font-afm/APKBUILD b/main/perl-font-afm/APKBUILD
index bd3ac64bb..bd3ac64bb 100644
--- a/testing/perl-font-afm/APKBUILD
+++ b/main/perl-font-afm/APKBUILD
diff --git a/testing/perl-hash-multivalue/APKBUILD b/main/perl-hash-multivalue/APKBUILD
index a68e2f0bc..a68e2f0bc 100644
--- a/testing/perl-hash-multivalue/APKBUILD
+++ b/main/perl-hash-multivalue/APKBUILD
diff --git a/testing/perl-html-format/APKBUILD b/main/perl-html-format/APKBUILD
index eb4c7740a..eb4c7740a 100644
--- a/testing/perl-html-format/APKBUILD
+++ b/main/perl-html-format/APKBUILD
diff --git a/testing/perl-html-mason-psgihandler/APKBUILD b/main/perl-html-mason-psgihandler/APKBUILD
index bed4fbed5..bed4fbed5 100644
--- a/testing/perl-html-mason-psgihandler/APKBUILD
+++ b/main/perl-html-mason-psgihandler/APKBUILD
diff --git a/testing/perl-html-mason/APKBUILD b/main/perl-html-mason/APKBUILD
index 74944ed92..74944ed92 100644
--- a/testing/perl-html-mason/APKBUILD
+++ b/main/perl-html-mason/APKBUILD
diff --git a/testing/perl-html-quoted/APKBUILD b/main/perl-html-quoted/APKBUILD
index b88a76f2d..b88a76f2d 100644
--- a/testing/perl-html-quoted/APKBUILD
+++ b/main/perl-html-quoted/APKBUILD
diff --git a/testing/perl-html-rewriteattributes/APKBUILD b/main/perl-html-rewriteattributes/APKBUILD
index 76b39c5aa..76b39c5aa 100644
--- a/testing/perl-html-rewriteattributes/APKBUILD
+++ b/main/perl-html-rewriteattributes/APKBUILD
diff --git a/testing/perl-html-scrubber/APKBUILD b/main/perl-html-scrubber/APKBUILD
index 38c020086..38c020086 100644
--- a/testing/perl-html-scrubber/APKBUILD
+++ b/main/perl-html-scrubber/APKBUILD
diff --git a/testing/perl-html-tagset/APKBUILD b/main/perl-html-tagset/APKBUILD
index 7ae5ccab4..891eb3506 100644
--- a/testing/perl-html-tagset/APKBUILD
+++ b/main/perl-html-tagset/APKBUILD
@@ -25,7 +25,7 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	make
+	make && make test
 }
 
 package() {
diff --git a/testing/perl-html-tree/APKBUILD b/main/perl-html-tree/APKBUILD
index c564a23e1..c564a23e1 100644
--- a/testing/perl-html-tree/APKBUILD
+++ b/main/perl-html-tree/APKBUILD
diff --git a/testing/perl-http-body/APKBUILD b/main/perl-http-body/APKBUILD
index e8a266e6b..e8a266e6b 100644
--- a/testing/perl-http-body/APKBUILD
+++ b/main/perl-http-body/APKBUILD
diff --git a/testing/perl-image-exiftool/APKBUILD b/main/perl-image-exiftool/APKBUILD
index b7c3a100e..7875926b9 100644
--- a/testing/perl-image-exiftool/APKBUILD
+++ b/main/perl-image-exiftool/APKBUILD
@@ -27,7 +27,7 @@ prepare() {
 build() {
 	cd $_builddir
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-ipc-run3/APKBUILD b/main/perl-ipc-run3/APKBUILD
index 520b851e0..520b851e0 100644
--- a/testing/perl-ipc-run3/APKBUILD
+++ b/main/perl-ipc-run3/APKBUILD
diff --git a/testing/perl-javascript-minifier/APKBUILD b/main/perl-javascript-minifier/APKBUILD
index c514dae64..c514dae64 100644
--- a/testing/perl-javascript-minifier/APKBUILD
+++ b/main/perl-javascript-minifier/APKBUILD
diff --git a/testing/perl-json/APKBUILD b/main/perl-json/APKBUILD
index 0b710efb3..3d105c1a7 100644
--- a/testing/perl-json/APKBUILD
+++ b/main/perl-json/APKBUILD
@@ -18,7 +18,7 @@ _builddir="$srcdir/$_pkgreal-$pkgver"
 build() {
 	cd "$_builddir"
         PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-list-moreutils/APKBUILD b/main/perl-list-moreutils/APKBUILD
index cade2866a..cade2866a 100644
--- a/testing/perl-list-moreutils/APKBUILD
+++ b/main/perl-list-moreutils/APKBUILD
diff --git a/testing/perl-list-utilsby/APKBUILD b/main/perl-list-utilsby/APKBUILD
index cde433b47..cde433b47 100644
--- a/testing/perl-list-utilsby/APKBUILD
+++ b/main/perl-list-utilsby/APKBUILD
diff --git a/testing/perl-locale-maketext-fuzzy/APKBUILD b/main/perl-locale-maketext-fuzzy/APKBUILD
index 0f0bb0c1b..0f0bb0c1b 100644
--- a/testing/perl-locale-maketext-fuzzy/APKBUILD
+++ b/main/perl-locale-maketext-fuzzy/APKBUILD
diff --git a/testing/perl-locale-maketext-lexicon/APKBUILD b/main/perl-locale-maketext-lexicon/APKBUILD
index d5b82e4ee..d5b82e4ee 100644
--- a/testing/perl-locale-maketext-lexicon/APKBUILD
+++ b/main/perl-locale-maketext-lexicon/APKBUILD
diff --git a/testing/perl-log-any/APKBUILD b/main/perl-log-any/APKBUILD
index 27739a818..27739a818 100644
--- a/testing/perl-log-any/APKBUILD
+++ b/main/perl-log-any/APKBUILD
diff --git a/testing/perl-log-dispatch/APKBUILD b/main/perl-log-dispatch/APKBUILD
index 6c8580409..00684f0b5 100644
--- a/testing/perl-log-dispatch/APKBUILD
+++ b/main/perl-log-dispatch/APKBUILD
@@ -27,7 +27,7 @@ prepare() {
 build() {
 	cd "$_builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-lwp-useragent-determined/APKBUILD b/main/perl-lwp-useragent-determined/APKBUILD
index a2d910718..fb2f1aef4 100644
--- a/testing/perl-lwp-useragent-determined/APKBUILD
+++ b/main/perl-lwp-useragent-determined/APKBUILD
@@ -1,25 +1,27 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=perl-lwp-useragent-determined
-_realname=LWP-UserAgent-Determined
+_pkgreal=LWP-UserAgent-Determined
 pkgver=1.05
-pkgrel=1
-pkgdesc="A virtual browser that retries errors"
+pkgrel=3
+pkgdesc="a virtual browser that retries errors"
 url="http://search.cpan.org/dist/LWP-UserAgent-Determined/"
 arch="noarch"
 license="GPL PerlArtistic"
-depends="perl"
-makedepends="perl-dev"
+cpandepends="perl-libwww"
+cpanmakedepends=""
+depends="perl $cpandepends"
+makedepends="perl-dev $cpanmakedepends"
 install=
 subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/$_realname-$pkgver.tar.gz"
+source="http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_realname-$pkgver"
+_builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	cd $_builddir
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-math-round/APKBUILD b/main/perl-math-round/APKBUILD
index e6532a17e..e6532a17e 100644
--- a/testing/perl-math-round/APKBUILD
+++ b/main/perl-math-round/APKBUILD
diff --git a/testing/perl-mime-lite/APKBUILD b/main/perl-mime-lite/APKBUILD
index 7be8b0025..8686eea9e 100644
--- a/testing/perl-mime-lite/APKBUILD
+++ b/main/perl-mime-lite/APKBUILD
@@ -1,25 +1,27 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=perl-mime-lite
-_realname=MIME-Lite
+_pkgreal=MIME-Lite
 pkgver=3.027
-pkgrel=1
+pkgrel=3
 pkgdesc="low-calorie MIME generator"
-url="http://search.cpan.org/~rjbs/MIME-Lite-3.027/"
+url="http://search.cpan.org/dist/MIME-Lite/"
 arch="noarch"
 license="GPL PerlArtistic"
-depends="perl"
-makedepends="perl-dev"
+cpandepends="perl-mime-types perl-email-date-format perl-mail-tools"
+cpanmakedepends=""
+depends="perl $cpandepends"
+makedepends="perl-dev $cpanmakedepends"
 install=
 subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_realname-$pkgver.tar.gz"
+source="http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_realname-$pkgver"
+_builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	cd $_builddir
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-mime-types/APKBUILD b/main/perl-mime-types/APKBUILD
index c9726ed4b..c9726ed4b 100644
--- a/testing/perl-mime-types/APKBUILD
+++ b/main/perl-mime-types/APKBUILD
diff --git a/testing/perl-module-versions-report/APKBUILD b/main/perl-module-versions-report/APKBUILD
index 2e0ff1c16..2e0ff1c16 100644
--- a/testing/perl-module-versions-report/APKBUILD
+++ b/main/perl-module-versions-report/APKBUILD
diff --git a/testing/perl-net-cidr/APKBUILD b/main/perl-net-cidr/APKBUILD
index 1304a2746..1304a2746 100644
--- a/testing/perl-net-cidr/APKBUILD
+++ b/main/perl-net-cidr/APKBUILD
diff --git a/testing/perl-parallel-prefork/APKBUILD b/main/perl-parallel-prefork/APKBUILD
index d78ce27c2..d78ce27c2 100644
--- a/testing/perl-parallel-prefork/APKBUILD
+++ b/main/perl-parallel-prefork/APKBUILD
diff --git a/testing/perl-params-util/APKBUILD b/main/perl-params-util/APKBUILD
index 2accecfdb..2accecfdb 100644
--- a/testing/perl-params-util/APKBUILD
+++ b/main/perl-params-util/APKBUILD
diff --git a/testing/perl-params-validate/APKBUILD b/main/perl-params-validate/APKBUILD
index c6255564c..c6255564c 100644
--- a/testing/perl-params-validate/APKBUILD
+++ b/main/perl-params-validate/APKBUILD
diff --git a/testing/perl-php-serialization/APKBUILD b/main/perl-php-serialization/APKBUILD
index cdeacec37..afe3edfc7 100644
--- a/testing/perl-php-serialization/APKBUILD
+++ b/main/perl-php-serialization/APKBUILD
@@ -19,7 +19,7 @@ _builddir="$srcdir/$_realname-$pkgver"
 build() {
 	cd $_builddir
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-plack/APKBUILD b/main/perl-plack/APKBUILD
index 6746ef093..6746ef093 100644
--- a/testing/perl-plack/APKBUILD
+++ b/main/perl-plack/APKBUILD
diff --git a/testing/perl-proc-wait3/APKBUILD b/main/perl-proc-wait3/APKBUILD
index 424e616e0..424e616e0 100644
--- a/testing/perl-proc-wait3/APKBUILD
+++ b/main/perl-proc-wait3/APKBUILD
diff --git a/testing/perl-regexp-common-net-cidr/APKBUILD b/main/perl-regexp-common-net-cidr/APKBUILD
index 087be7b53..087be7b53 100644
--- a/testing/perl-regexp-common-net-cidr/APKBUILD
+++ b/main/perl-regexp-common-net-cidr/APKBUILD
diff --git a/testing/perl-regexp-common/APKBUILD b/main/perl-regexp-common/APKBUILD
index 29055d826..29055d826 100644
--- a/testing/perl-regexp-common/APKBUILD
+++ b/main/perl-regexp-common/APKBUILD
diff --git a/testing/perl-regexp-ipv6/APKBUILD b/main/perl-regexp-ipv6/APKBUILD
index 179fc4d35..179fc4d35 100644
--- a/testing/perl-regexp-ipv6/APKBUILD
+++ b/main/perl-regexp-ipv6/APKBUILD
diff --git a/testing/perl-scope-guard/APKBUILD b/main/perl-scope-guard/APKBUILD
index bd4706430..bd4706430 100644
--- a/testing/perl-scope-guard/APKBUILD
+++ b/main/perl-scope-guard/APKBUILD
diff --git a/testing/perl-server-starter/APKBUILD b/main/perl-server-starter/APKBUILD
index e1613a863..e1613a863 100644
--- a/testing/perl-server-starter/APKBUILD
+++ b/main/perl-server-starter/APKBUILD
diff --git a/testing/perl-socket-getaddrinfo/APKBUILD b/main/perl-socket-getaddrinfo/APKBUILD
index 43a0f366e..e2c439fc7 100644
--- a/testing/perl-socket-getaddrinfo/APKBUILD
+++ b/main/perl-socket-getaddrinfo/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer:
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-socket-getaddrinfo
 _pkgreal=Socket-GetAddrInfo
 pkgver=0.20
@@ -18,7 +18,7 @@ _builddir="$srcdir/$_pkgreal-$pkgver"
 build() {
 	cd "$_builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-starlet/APKBUILD b/main/perl-starlet/APKBUILD
index 991872f86..991872f86 100644
--- a/testing/perl-starlet/APKBUILD
+++ b/main/perl-starlet/APKBUILD
diff --git a/testing/perl-sub-exporter/APKBUILD b/main/perl-sub-exporter/APKBUILD
index 800fa3128..800fa3128 100644
--- a/testing/perl-sub-exporter/APKBUILD
+++ b/main/perl-sub-exporter/APKBUILD
diff --git a/testing/perl-sub-install/APKBUILD b/main/perl-sub-install/APKBUILD
index 6dc887b8c..6dc887b8c 100644
--- a/testing/perl-sub-install/APKBUILD
+++ b/main/perl-sub-install/APKBUILD
diff --git a/testing/perl-sys-mmap/APKBUILD b/main/perl-sys-mmap/APKBUILD
index 9da9fe316..4c9f89099 100644
--- a/testing/perl-sys-mmap/APKBUILD
+++ b/main/perl-sys-mmap/APKBUILD
@@ -18,7 +18,7 @@ _builddir="$srcdir/$_realname-$pkgver"
 build() {
 	cd $_builddir
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 package() {
 	cd $_builddir
diff --git a/testing/perl-term-readkey/APKBUILD b/main/perl-term-readkey/APKBUILD
index 5c39772bd..5c39772bd 100644
--- a/testing/perl-term-readkey/APKBUILD
+++ b/main/perl-term-readkey/APKBUILD
diff --git a/testing/perl-test-deep/APKBUILD b/main/perl-test-deep/APKBUILD
index 353acb474..353acb474 100644
--- a/testing/perl-test-deep/APKBUILD
+++ b/main/perl-test-deep/APKBUILD
diff --git a/testing/perl-test-fatal/APKBUILD b/main/perl-test-fatal/APKBUILD
index aecb8a40a..aecb8a40a 100644
--- a/testing/perl-test-fatal/APKBUILD
+++ b/main/perl-test-fatal/APKBUILD
diff --git a/testing/perl-test-longstring/APKBUILD b/main/perl-test-longstring/APKBUILD
index a3f895f12..a3f895f12 100644
--- a/testing/perl-test-longstring/APKBUILD
+++ b/main/perl-test-longstring/APKBUILD
diff --git a/testing/perl-test-manifest/APKBUILD b/main/perl-test-manifest/APKBUILD
index 28c5b353c..28c5b353c 100644
--- a/testing/perl-test-manifest/APKBUILD
+++ b/main/perl-test-manifest/APKBUILD
diff --git a/testing/perl-test-nowarnings/APKBUILD b/main/perl-test-nowarnings/APKBUILD
index 8a9975455..8a9975455 100644
--- a/testing/perl-test-nowarnings/APKBUILD
+++ b/main/perl-test-nowarnings/APKBUILD
diff --git a/testing/perl-test-requires/APKBUILD b/main/perl-test-requires/APKBUILD
index d9b6ff2af..d9b6ff2af 100644
--- a/testing/perl-test-requires/APKBUILD
+++ b/main/perl-test-requires/APKBUILD
diff --git a/testing/perl-test-sharedfork/APKBUILD b/main/perl-test-sharedfork/APKBUILD
index ead065051..ead065051 100644
--- a/testing/perl-test-sharedfork/APKBUILD
+++ b/main/perl-test-sharedfork/APKBUILD
diff --git a/testing/perl-test-tcp/APKBUILD b/main/perl-test-tcp/APKBUILD
index 9f0518b1f..9f0518b1f 100644
--- a/testing/perl-test-tcp/APKBUILD
+++ b/main/perl-test-tcp/APKBUILD
diff --git a/testing/perl-test-tester/APKBUILD b/main/perl-test-tester/APKBUILD
index bb541ce61..bb541ce61 100644
--- a/testing/perl-test-tester/APKBUILD
+++ b/main/perl-test-tester/APKBUILD
diff --git a/testing/perl-test-warn/APKBUILD b/main/perl-test-warn/APKBUILD
index f10f53d99..f10f53d99 100644
--- a/testing/perl-test-warn/APKBUILD
+++ b/main/perl-test-warn/APKBUILD
diff --git a/testing/perl-text-autoformat/APKBUILD b/main/perl-text-autoformat/APKBUILD
index b0f086b74..b0f086b74 100644
--- a/testing/perl-text-autoformat/APKBUILD
+++ b/main/perl-text-autoformat/APKBUILD
diff --git a/testing/perl-text-password-pronounceable/APKBUILD b/main/perl-text-password-pronounceable/APKBUILD
index f0b96499f..f0b96499f 100644
--- a/testing/perl-text-password-pronounceable/APKBUILD
+++ b/main/perl-text-password-pronounceable/APKBUILD
diff --git a/testing/perl-text-quoted/APKBUILD b/main/perl-text-quoted/APKBUILD
index f9d0dd333..f9d0dd333 100644
--- a/testing/perl-text-quoted/APKBUILD
+++ b/main/perl-text-quoted/APKBUILD
diff --git a/testing/perl-text-reform/APKBUILD b/main/perl-text-reform/APKBUILD
index 79ce4e615..79ce4e615 100644
--- a/testing/perl-text-reform/APKBUILD
+++ b/main/perl-text-reform/APKBUILD
diff --git a/testing/perl-text-template/APKBUILD b/main/perl-text-template/APKBUILD
index d777f62b2..d777f62b2 100644
--- a/testing/perl-text-template/APKBUILD
+++ b/main/perl-text-template/APKBUILD
diff --git a/testing/perl-text-vfile-asdata/APKBUILD b/main/perl-text-vfile-asdata/APKBUILD
index dca99e37b..dca99e37b 100644
--- a/testing/perl-text-vfile-asdata/APKBUILD
+++ b/main/perl-text-vfile-asdata/APKBUILD
diff --git a/testing/perl-text-wikiformat/APKBUILD b/main/perl-text-wikiformat/APKBUILD
index 9a9a096e0..9a9a096e0 100644
--- a/testing/perl-text-wikiformat/APKBUILD
+++ b/main/perl-text-wikiformat/APKBUILD
diff --git a/testing/perl-text-wrapper/APKBUILD b/main/perl-text-wrapper/APKBUILD
index 5e17c6f10..5e17c6f10 100644
--- a/testing/perl-text-wrapper/APKBUILD
+++ b/main/perl-text-wrapper/APKBUILD
diff --git a/testing/perl-time-parsedate/APKBUILD b/main/perl-time-modules/APKBUILD
index 10cdef6a7..ed90c9df5 100644
--- a/testing/perl-time-parsedate/APKBUILD
+++ b/main/perl-time-modules/APKBUILD
@@ -1,11 +1,11 @@
 # Contributor:  Francesco Colista <francesco.colista@gmail.com>
 # Maintainer:  Francesco Colista <francesco.colista@gmail.com>
-pkgname=perl-time-parsedate
+pkgname=perl-time-modules
 _realname=Time-modules
-pkgver=2006.0814
+pkgver=2011.0517
 pkgrel=1
 pkgdesc="Timezone perl module"
-url="http://search.cpan.org/dist/Astro-SunTime/"
+url="http://search.cpan.org/dist/Time-Modules/"
 arch="noarch"
 license="GPL PerlArtistic"
 depends="perl"
@@ -30,4 +30,4 @@ package() {
 
 }
 
-md5sums="790c6739f601b85654fac9ee516b18d8  Time-modules-2006.0814.tar.gz"
+md5sums="67204ebc06211a877665765f91dc4e51  Time-modules-2011.0517.tar.gz"
diff --git a/testing/perl-tree-dag_node/APKBUILD b/main/perl-tree-dag_node/APKBUILD
index 07099fe1c..07099fe1c 100644
--- a/testing/perl-tree-dag_node/APKBUILD
+++ b/main/perl-tree-dag_node/APKBUILD
diff --git a/testing/perl-tree-simple/APKBUILD b/main/perl-tree-simple/APKBUILD
index 43aa3af4b..7b75973ab 100644
--- a/testing/perl-tree-simple/APKBUILD
+++ b/main/perl-tree-simple/APKBUILD
@@ -1,19 +1,22 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-tree-simple
+_pkgreal=Tree-Simple
 pkgver=1.18
-pkgrel=0
+pkgrel=1
 pkgdesc="Tree::Simple Perl module"
 url="http://search.cpan.org/dist/Tree-Simple/"
 arch="noarch"
 license="GPL+ or Artistic"
-depends="perl"
-makedepends="perl-dev"
+cpandepends="perl-test-exception"
+cpanmakedepends=""
+depends="perl $cpandepends"
+makedepends="perl-dev $cpanmakedepends"
 install=""
 subpackages="$pkgname-doc"
 source="http://www.cpan.org/modules/by-module/Tree/Tree-Simple-$pkgver.tar.gz"
 
-_builddir="$srcdir"/Tree-Simple-$pkgver
+_builddir="$srcdir"/$_pkgreal-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -22,12 +25,12 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
 }
 
 build() {
 	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-try-tiny/APKBUILD b/main/perl-try-tiny/APKBUILD
index 14e30fa9a..14e30fa9a 100644
--- a/testing/perl-try-tiny/APKBUILD
+++ b/main/perl-try-tiny/APKBUILD
diff --git a/testing/perl-universal-require/APKBUILD b/main/perl-universal-require/APKBUILD
index 134e755aa..6abf1f7e2 100644
--- a/testing/perl-universal-require/APKBUILD
+++ b/main/perl-universal-require/APKBUILD
@@ -27,7 +27,7 @@ prepare() {
 build() {
 	cd "$_builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-want/APKBUILD b/main/perl-want/APKBUILD
index d5d3e3a10..d5d3e3a10 100644
--- a/testing/perl-want/APKBUILD
+++ b/main/perl-want/APKBUILD
diff --git a/testing/perl-x10/APKBUILD b/main/perl-x10/APKBUILD
index ca2b501b2..35c9421c7 100644
--- a/testing/perl-x10/APKBUILD
+++ b/main/perl-x10/APKBUILD
@@ -3,13 +3,14 @@
 pkgname=perl-x10
 _realname=X10
 pkgver=0.03
-pkgrel=1
+pkgrel=2
 pkgdesc="Perl module to control X10 devices"
 url="http://search.cpan.org/~robf/X10-0.03/"
 arch="noarch"
 license="unknown"
 depends="perl"
-makedepends="perl-dev perl-astro-suntime perl-time-parsedate perl-device-serialport"
+makedepends="perl-dev perl-astro-suntime perl-time-modules
+	perl-device-serialport"
 install=
 subpackages=""
 source="http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/$_realname-$pkgver.tar.gz"
@@ -19,7 +20,7 @@ _builddir="$srcdir/$_realname-$pkgver"
 build() {
 	cd $_builddir
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make && make test || return 1
 }
 
 package() {
diff --git a/testing/perl-xml-rss/APKBUILD b/main/perl-xml-rss/APKBUILD
index e6e72d055..e6e72d055 100644
--- a/testing/perl-xml-rss/APKBUILD
+++ b/main/perl-xml-rss/APKBUILD
diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux-ng/APKBUILD
index 98b38fc7d..5921a5947 100644
--- a/main/util-linux-ng/APKBUILD
+++ b/main/util-linux-ng/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=util-linux-ng
 pkgver=2.19.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Random collection of Linux utilities"
 url="http://kernel.org/~kzak/util-linux/"
 arch="all"
@@ -13,7 +13,7 @@ makedepends="zlib-dev sed ncurses-dev"
 install=
 source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${pkgver%.*}/util-linux-$pkgver.tar.gz
 	program-invocation.patch"
-subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk"
+subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk mcookie"
 replaces="e2fsprogs"
 
 _builddir="$srcdir/util-linux-$pkgver"
@@ -72,7 +72,7 @@ libblkid() {
 }
 
 sfdisk() {
-	pkgdesk="Partition table manipulator from util-linux-ng"
+	pkgdesc="Partition table manipulator from util-linux-ng"
 	depends=
 	mkdir -p "$subpkgdir"/sbin
 	mv "$pkgdir"/sbin/sfdisk "$subpkgdir"/sbin/
@@ -80,11 +80,17 @@ sfdisk() {
 
 
 cfdisk() {
-	pkgdesk="Curses based partition table manipulator from util-linux-ng"
+	pkgdesc="Curses based partition table manipulator from util-linux-ng"
 	depends=
 	mkdir -p "$subpkgdir"/sbin
 	mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/
 }
 
+mcookie() {
+	pkgdesc="mcookie from util-linux-ng"
+	replaces="util-linux-ng"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/mcookie "$subpkgdir"/usr/bin/
+}
 md5sums="dd242eeb2ba76e4e55bf2237a50dd2b7  util-linux-2.19.1.tar.gz
 079dc713684e01ad48c7e0bb877dc51a  program-invocation.patch"
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 3c1423a8b..63b4abbec 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vlc
 pkgver=1.1.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 url="http://www.videolan.org/vlc/"
 arch="all"
@@ -54,6 +54,8 @@ makedepends="
 	taglib-dev
 	v4l-utils-dev
 	x264-dev
+	xcb-util-renderutil-dev
+	xcb-util-keysyms-dev
 	"
 source="http://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
 	uclibc3.patch
diff --git a/main/xcb-util-image/APKBUILD b/main/xcb-util-image/APKBUILD
new file mode 100644
index 000000000..41a8c4812
--- /dev/null
+++ b/main/xcb-util-image/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xcb-util-image
+pkgver=0.3.8
+pkgrel=0
+pkgdesc="Utility libraries for XC Binding - image"
+url="http://xcb.freedesktop.org/"
+arch="all"
+license="MIT"
+depends=
+depends_dev="xcb-util-dev"
+makedepends="$depends_dev m4"
+install=""
+replaces="xcb-util"
+subpackages="$pkgname-dev"
+source="http://xcb.freedesktop.org/dist/xcb-util-image-$pkgver.tar.gz"
+
+_builddir="$srcdir"/xcb-util-image-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="b6d1359b5851ea319a81e15c18f34aeb  xcb-util-image-0.3.8.tar.gz"
diff --git a/main/xcb-util-keysyms/APKBUILD b/main/xcb-util-keysyms/APKBUILD
new file mode 100644
index 000000000..b97c1c4b7
--- /dev/null
+++ b/main/xcb-util-keysyms/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xcb-util-keysyms
+pkgver=0.3.8
+pkgrel=0
+pkgdesc="Utility libraries for XC Binding - keysyms"
+url="http://xcb.freedesktop.org/"
+arch="all"
+license="MIT"
+depends=
+depends_dev="xcb-util-dev"
+makedepends="$depends_dev m4"
+install=""
+replaces="xcb-util"
+subpackages="$pkgname-dev"
+source="http://xcb.freedesktop.org/dist/xcb-util-keysyms-$pkgver.tar.gz"
+
+_builddir="$srcdir"/xcb-util-keysyms-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="3d6608213de3b7581cfe64d68035a83f  xcb-util-keysyms-0.3.8.tar.gz"
diff --git a/main/xcb-util-renderutil/APKBUILD b/main/xcb-util-renderutil/APKBUILD
new file mode 100644
index 000000000..a1ab80ac7
--- /dev/null
+++ b/main/xcb-util-renderutil/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xcb-util-renderutil
+pkgver=0.3.8
+pkgrel=0
+pkgdesc="Utility libraries for XC Binding - renderutil"
+url="http://xcb.freedesktop.org/"
+arch="all"
+license="MIT"
+depends=
+depends_dev="xcb-util-dev"
+makedepends="$depends_dev m4"
+install=""
+replaces="xcb-util"
+subpackages="$pkgname-dev"
+source="http://xcb.freedesktop.org/dist/xcb-util-renderutil-$pkgver.tar.gz"
+
+_builddir="$srcdir"/xcb-util-renderutil-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="8097c46659bb2cf60c6a8c72604b8524  xcb-util-renderutil-0.3.8.tar.gz"
diff --git a/main/xcb-util-wm/APKBUILD b/main/xcb-util-wm/APKBUILD
new file mode 100644
index 000000000..91586821e
--- /dev/null
+++ b/main/xcb-util-wm/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xcb-util-wm
+pkgver=0.3.8
+pkgrel=0
+pkgdesc="Utility libraries for XC Binding - wm"
+url="http://xcb.freedesktop.org/"
+arch="all"
+license="MIT"
+depends=
+depends_dev="xcb-util-dev"
+makedepends="$depends_dev m4"
+install=""
+replaces="xcb-util"
+subpackages="$pkgname-dev"
+source="http://xcb.freedesktop.org/dist/xcb-util-wm-$pkgver.tar.gz"
+
+_builddir="$srcdir"/xcb-util-wm-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="5a6c17935e44c52a00af7d4355a88650  xcb-util-wm-0.3.8.tar.gz"
diff --git a/main/xcb-util/APKBUILD b/main/xcb-util/APKBUILD
index f6d9618d6..843f545f9 100644
--- a/main/xcb-util/APKBUILD
+++ b/main/xcb-util/APKBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xcb-util
 pkgver=0.3.8
-pkgrel=0
+pkgrel=1
 pkgdesc="Utility libraries for XC Binding"
 url="http://xcb.freedesktop.org"
 arch="all"
 license="GPL"
 subpackages="$pkgname-dev"
 depends=
-makedepends="m4 libxcb-dev gperf pkgconfig"
+depends_dev="libxcb-dev"
+makedepends="m4 $depends_dev gperf pkgconfig"
 source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
 
-depend_dev="libxcb-dev"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	./configure --prefix=/usr --disable-static || return 1
diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD
index db9cf67a9..866ed147d 100644
--- a/main/xf86-video-intel/APKBUILD
+++ b/main/xf86-video-intel/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-intel
 pkgver=2.15.0
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for Intel cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xfce4-panel/APKBUILD b/main/xfce4-panel/APKBUILD
index 3a5e70ba1..fffb47d1c 100644
--- a/main/xfce4-panel/APKBUILD
+++ b/main/xfce4-panel/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-panel
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Panel for the Xfce desktop environment"
 url="http://www.xfce.org/"
 arch="all"
diff --git a/testing/xfce4-power-manager/APKBUILD b/main/xfce4-power-manager/APKBUILD
index 340962cc3..340962cc3 100644
--- a/testing/xfce4-power-manager/APKBUILD
+++ b/main/xfce4-power-manager/APKBUILD
diff --git a/main/xinit/APKBUILD b/main/xinit/APKBUILD
index 788f1284c..8b809843f 100644
--- a/main/xinit/APKBUILD
+++ b/main/xinit/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xinit
 pkgver=1.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org initialisation program "
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="GPL"
 subpackages="$pkgname-doc"
-depends="xauth"
+depends="xauth mcookie"
 makedepends="pkgconfig libx11-dev"
 source="http://xorg.freedesktop.org/releases/individual/app/xinit-$pkgver.tar.bz2
 	06_move_serverauthfile_into_tmp.patch
diff --git a/testing/mdocml/APKBUILD b/testing/mdocml/APKBUILD
index 716cd9c37..384881fcc 100644
--- a/testing/mdocml/APKBUILD
+++ b/testing/mdocml/APKBUILD
@@ -1,8 +1,7 @@
-# Contributor: 
-# Maintainer: 
+# Maintainer:  Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mdocml
-pkgver=1.10.5
-pkgrel=0
+pkgver=1.11.3
+pkgrel=1
 pkgdesc="Roff implementation"
 url="http://mdocml.bsd.lv/"
 arch="all"
@@ -10,25 +9,24 @@ license="BSD"
 depends=
 makedepends=
 install=
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-dev"
 source="http://mdocml.bsd.lv/snapshots/mdocml-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
-	sed -i -e 's:/usr/local:/usr:' Makefile || return 1
 }
 
 build() {
 	cd "$_builddir"
-	make || return 1
+	make PREFIX=/usr || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" MANDIR=/usr/share/man \
+	make DESTDIR="$pkgdir" PREFIX=/usr MANDIR=/usr/share/man \
 		EXAMPLEDIR=/usr/share/doc/mdocml/examples install
 }
 
-md5sums="c563967a5d44ab7c423ea0b3ebb09ae5  mdocml-1.10.5.tar.gz"
+md5sums="497b4278acb96a087ee6f92c64b4a56d  mdocml-1.11.3.tar.gz"
diff --git a/testing/perl-dbd-pg/APKBUILD b/testing/perl-dbd-pg/APKBUILD
new file mode 100644
index 000000000..2b28d96f4
--- /dev/null
+++ b/testing/perl-dbd-pg/APKBUILD
@@ -0,0 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 1
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Timo Teräs <timo.teras@iki.fi>
+pkgname=perl-dbd-pg
+_pkgreal=DBD-Pg
+pkgver=2.18.1
+pkgrel=0
+pkgdesc="PostgreSQL database driver for the DBI module"
+url="http://search.cpan.org/dist/DBD-Pg/"
+arch="all"
+license="GPL PerlArtistic"
+cpandepends="perl-dbi"
+cpanmakedepends=""
+depends="$cpandepends"
+makedepends="perl-dev postgresql-dev $cpanmakedepends"
+subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/T/TU/TURNSTEP/$_pkgreal-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_pkgreal-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+}
+
+build() {
+	cd "$_builddir"
+	make && make test
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+md5sums="1f4a837b3d79789ad6854443fce7a901  DBD-Pg-2.18.1.tar.gz"
diff --git a/testing/perl-mime-base64/APKBUILD b/testing/perl-mime-base64/APKBUILD
deleted file mode 100644
index 60a2bd4cc..000000000
--- a/testing/perl-mime-base64/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Timo Teräs <timo.teras@iki.fi>
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
-pkgname=perl-mime-base64
-_pkgreal=MIME-Base64
-pkgver=3.13
-pkgrel=0
-pkgdesc="The RFC 2045 encodings; base64 and quoted-printable"
-url="http://search.cpan.org/dist/MIME-Base64/"
-arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	cd "$_builddir"
-	make
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-md5sums="a555d807b328aee871c686a6b6bae5b4  MIME-Base64-3.13.tar.gz"
diff --git a/testing/perl-test-exception/APKBUILD b/testing/perl-test-exception/APKBUILD
deleted file mode 100644
index 264305b61..000000000
--- a/testing/perl-test-exception/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer:
-pkgname=perl-test-exception
-_pkgreal=Test-Exception
-pkgver=0.31
-pkgrel=1
-pkgdesc="Perl module for testing exception-using code"
-url="http://search.cpan.org/dist/Test-Exception/"
-arch="noarch"
-license="GPL PerlArtistic"
-depends=
-makedepends="perl-dev"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/A/AD/ADIE/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-build() {
-	cd "$_builddir"
-        PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
-}
-
-package() {
-        cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-        find "$pkgdir" -name perllocal.pod -delete
-}
-
-md5sums="adb57ca7614d15e5b307bf5e024b35a8  Test-Exception-0.31.tar.gz"
diff --git a/testing/rt4/APKBUILD b/testing/rt4/APKBUILD
new file mode 100644
index 000000000..82c896d1e
--- /dev/null
+++ b/testing/rt4/APKBUILD
@@ -0,0 +1,129 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=rt4
+pkgver=4.0.0
+pkgrel=0
+pkgdesc="Request Tracker - issue and bug tracker"
+url="http://www.bestpractical.com/rt"
+arch="noarch"
+license="GPLv2+"
+depends="perl
+	perl-term-readkey
+	perl-cache-simple-timedexpiry
+	perl-class-accessor
+	perl-dbi
+	perl-dbd-pg
+	perl-dbd-mysql
+	perl-devel-globaldestruction
+	perl-devel-stacktrace
+	perl-digest-sha1
+	perl-email-address
+	perl-getopt-long
+	perl-locale-maketext-fuzzy
+	perl-locale-maketext-lexicon
+	perl-log-dispatch
+	perl-mime-tools
+	perl-net-cidr
+	perl-regexp-common-net-cidr
+	perl-sub-exporter
+	perl-text-password-pronounceable
+	perl-text-template
+	perl-text-wrapper
+	perl-time-hires
+	perl-time-parsedate
+	perl-tree-simple
+	perl-universal-require
+	perl-xml-rss
+	perl-text-wikiformat
+	perl-convert-color
+	perl-data-ical
+	perl-mime-types
+	perl-html-format
+	perl-html-rewriteattributes
+	perl-html-tree
+	perl-html-mason
+	perl-javascript-minifier
+	perl-cgi-psgi
+	perl-cgi-emulate-psgi
+	perl-html-mason-psgihandler
+	perl-apache-session
+	perl-starlet
+	perl-html-parser
+	perl-file-sharedir
+	perl-module-versions-report
+	perl-list-moreutils
+	perl-css-squish
+	perl-dbix-searchbuilder
+	perl-regexp-ipv6
+	perl-text-quoted
+	perl-html-scrubber
+	perl-html-quoted
+	perl-datetime-locale
+	perl-fcgi
+	perl-fcgi-procmanager
+	perl-datetime
+	perl-json
+	perl-ipc-run3
+	perl-plack
+	"
+
+makedepends="$depends"
+install=""
+subpackages=""
+source="http://www.bestpractical.com/pub/rt/release/rt-$pkgver.tar.gz
+	rt4-perl-qw-list-deprecation.patch"
+
+_builddir="$srcdir"/rt-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+
+	cat <<'EOF' >> config.layout
+# Alpione directory layout.
+<Layout Alpine>
+  prefix:		/usr
+  exec_prefix:		${prefix}
+  bindir:		${exec_prefix}/bin
+  sbindir:		${exec_prefix}/sbin
+  sysconfdir:		/etc/rt4
+  mandir:		${prefix}/share/man
+  plugindir:		${prefix}/lib/rt4/plugins
+  libdir:		${prefix}/lib/rt4/
+  datadir:		${prefix}/share/rt4
+  htmldir:		${datadir}/html
+  fontdir:		${datadir}/fonts
+  lexdir:		${datadir}/po
+  manualdir:		${datadir}/doc
+  localstatedir:	/var
+  logfiledir:		${localstatedir}/log
+  masonstatedir:	${localstatedir}/cache/mason_data
+  sessionstatedir:	${localstatedir}/cache/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+  customplugindir:	${customdir}/plugins
+</Layout>
+EOF
+}
+
+build() {
+	cd "$_builddir"
+	./configure --enable-layout=Alpine \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="bd6045421a6f2d0e8c18923f80726e4a  rt-4.0.0.tar.gz
+ff469c9469be2bc094601939068e60ae  rt4-perl-qw-list-deprecation.patch"
diff --git a/testing/rt4/rt4-perl-qw-list-deprecation.patch b/testing/rt4/rt4-perl-qw-list-deprecation.patch
new file mode 100644
index 000000000..688753999
--- /dev/null
+++ b/testing/rt4/rt4-perl-qw-list-deprecation.patch
@@ -0,0 +1,49 @@
+--- a/share/html/Ticket/Elements/PreviewScrips
++++ b/share/html/Ticket/Elements/PreviewScrips
+@@ -69,7 +69,7 @@
+           <b><% $scrip->Description || loc('Scrip #[_1]',$scrip->id) %></b><br />
+           <&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name)&>[_1] [_2] with template [_3]</&>
+           <br />
+-%         for my $type qw(To Cc Bcc) {
++%         for my $type (qw(To Cc Bcc)) {
+ %             my @addresses =  $scrip->ActionObj->Action->$type();
+ %             next unless @addresses;
+               <ul>
+@@ -97,7 +97,7 @@
+ %         next unless $rule->{hints} && $rule->{hints}{class} eq 'SendEmail';
+           <b><% $rule->Describe %></b>
+ %         my $data = $rule->{hints}{recipients};
+-%         for my $type qw(To Cc Bcc) {
++%         for my $type (qw(To Cc Bcc)) {
+ %             next unless @{$data->{$type}};
+               <ul>
+ %             for my $address (@{$data->{$type}}) {
+--- a/share/html/Ticket/Elements/ShowSimplifiedRecipients
++++ b/share/html/Ticket/Elements/ShowSimplifiedRecipients
+@@ -58,7 +58,7 @@
+ my %headers = (To => {}, Cc => {}, Bcc => {});
+ if ($Object->Scrips) {
+     for my $scrip (grep $_->ActionObj->Action->isa('RT::Action::SendEmail'), @{$Object->Scrips->Prepared}) {
+-        for my $type qw(To Cc Bcc) {
++        for my $type (qw(To Cc Bcc)) {
+             $headers{$type}{$_->address} = $_
+                 for $scrip->ActionObj->Action->$type();
+         }
+@@ -66,7 +66,7 @@
+ }
+ if ($Object->Rules) {
+     for my $rule (grep {$_->{hints} and $_->{hints}{class} eq "SendEmail"} @{$Object->Rules}) {
+-        for my $type qw(To Cc Bcc) {
++        for my $type (qw(To Cc Bcc)) {
+             $headers{$type}{$_} ||= @{[Email::Address->parse($_)]}[0] # Hate list context
+                 for @{$rule->{hints}{recipients}{$type}};
+         }
+@@ -77,7 +77,7 @@
+ <&|/Widgets/TitleBox, title => loc('Recipients'), id => 'recipients' &>
+ <table>
+ <tr>
+-% for my $type qw(To Cc Bcc) {
++% for my $type (qw(To Cc Bcc)) {
+ %     next unless keys %{$headers{$type}};
+ <td valign="top"><% $type %>:</td>
+ <td valign="top">