Merge remote-tracking branch 'upstream/master'

srcpkgs/libgsf/template

@@ -1,7 +1,7 @@
 # Template build file for 'libgsf'.
 pkgname=libgsf
-version=1.14.26
+version=1.14.27
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-introspection=yes"
 hostmakedepends="pkg-config intltool gobject-introspection"
@@ -11,11 +11,11 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
 homepage="http://www.gnome.org/"
 distfiles="${GNOME_SITE}/libgsf/1.14/$pkgname-$version.tar.xz"
-checksum=8919e725aadd785380350c8dec7427d82cf33164bc9a9a549df9440a0c3da6d5
+checksum=a012e63bedd6003cea9ae8fa78944516b50c334767163b88527c6b2332bc3e6c
 
 libgsf-devel_package() {
 	depends="libglib-devel libxml2-devel libgsf>=${version}"
-	short_desc+=" -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

srcpkgs/mcwm/template

@@ -0,0 +1,33 @@
+# Template file for 'mcwm'
+pkgname=mcwm
+_distver=20130209
+_patchver=2
+wrksrc=${pkgname}-${_distver}-${_patchver}
+version=${_distver}.${_patchver}
+revision=2
+build_style=gnu-makefile
+makedepends="libxcb-devel xcb-proto xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel"
+short_desc="A minimalist stacking X window manager based on XCB"
+maintainer="Ypnose <linuxienATlegtuxDOTorg>"
+license="ISC"
+homepage="http://hack.org/mc/projects/mcwm/"
+distfiles="http://hack.org/mc/hacks/$pkgname/$pkgname-${_distver}-${_patchver}.tar.bz2"
+checksum=2d2f9ced77bc6f90cb9fbdbf790eed97f3be28caefb0de496ac28813aed606be
+
+do_build() {
+	sed -i 's/man\/man1/share\/man\/man1/g' Makefile
+	make CC=$CC ${makejobs}
+}
+
+do_install() {
+	vmkdir usr/bin
+	vmkdir usr/share/man/man1
+	make PREFIX=${DESTDIR}/usr install
+	vinstall LICENSE 644 usr/share/licenses/${pkgname}
+}
+
+mcwm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/slock/template

@@ -1,9 +1,9 @@
 # Template file for 'slock'
 pkgname=slock
 version=1.1
-revision=1
+revision=2
 hostmakedepends="pkg-config"
-makedepends="libXext-devel"
+makedepends="libX11-devel libXext-devel"
 short_desc="A simple screen locker for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -16,11 +16,15 @@ long_desc="
  day when they are out with friends or fetching some food from the local pub."
 
 do_build() {
-	make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 ${makejobs}
+	sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
+	sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk
+	sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk
+	make CC=$CC INCS="-I." LIBS="-lX11 -lXext -lcrypt" ${makejobs}
 }
 
 do_install() {
-	make PREFIX=/usr DESTDIR=${DESTDIR} install
+	make PREFIX=/usr DESTDIR=$DESTDIR install
+	vinstall LICENSE 644 usr/share/licenses/$pkgname
 }
 
 slock_package() {

srcpkgs/virtualbox-ose/template

@@ -1,8 +1,8 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-_vbox_distver=4.2.12
+_vbox_distver=4.2.14
 version=${_vbox_distver}
-revision=3
+revision=1
 wrksrc="VirtualBox-${version}"
 patch_args="-Np1"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://virtualbox.org"
 license="GPL-2, MPL-1.1, CDDL"
 distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
-checksum=eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6
+checksum=f8f6dc19612f3c84a5c857b8e5c452b8db2cf3c8c52a678b6a00e5dd5831130d
 
 only_for_archs="i686 x86_64"
 
@@ -126,7 +126,7 @@ virtualbox-ose-dkms_package() {
 
 virtualbox-ose-guest_package() {
 	systemd_services="vboxservice.service on"
-	depends="virtualbox-ose-guest-dkms-${version}_${revision}"
+	depends="xserver-abi-video-13_1 virtualbox-ose-guest-dkms-${version}_${revision}"
 	short_desc+=" - guest utilities"
 
 	pkg_install() {