Merge pull request #60 from ojab/master

Various fixes
2013-04-23 10:23:43 -07:00 · 2013-04-23 10:23:43 -07:00 · 23477f05f0
parent df59aabbb7 694ce3606f
commit 23477f05f0
34 changed files with 511 additions and 186 deletions
--- a/common/shlibs
+++ b/common/shlibs
@ -1226,3 +1226,9 @@ librumpnet_sockin.so.0 netbsd-rumpkernel-20130321_1
 librumpnet_net.so.0 netbsd-rumpkernel-20130321_1
 librumpnet.so.0 netbsd-rumpkernel-20130321_1
 librumpkern_sys_linux.so.0 netbsd-rumpkernel-20130321_1
+libdotconf.so.0 dotconf-1.3_1
+libspeechd.so.2 speech-dispatcher-0.8_1
+libre2.so.0 re2-20130115_1
+libminizip.so.1 minizip-1.2.7_1
+libsrtp.so.0 libsrtp-1.4.4_1
+libjsoncpp.so.0 jsoncpp-0.6.0rc2_1
--- a/srcpkgs/apr/template
+++ b/srcpkgs/apr/template
@ -23,7 +23,8 @@ apr-devel_package() {
 		vmove usr/include
 		vmove usr/bin
 		vmove usr/share
-		vmove "usr/lib/*.{a,exp}"
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.exp"
 		vmove usr/lib/pkgconfig 
 	}
 }
--- a/srcpkgs/bison25/template
+++ b/srcpkgs/bison25/template
@ -1,24 +0,0 @@
-# Template build file for 'bison25'.
-pkgname=bison25
-version=2.5.1
-revision=1
-wrksrc="bison-$version"
-build_style=gnu-configure
-short_desc="GNU yacc(1) replacement"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://www.gnu.org/software/bison/bison.html"
-license="GPL-3"
-distfiles="http://ftp.gnu.org/pub/gnu/bison/bison-$version.tar.xz"
-checksum=fec90caed650270484955ba6ee73ddb01186608799a27fcaaf868e5274c030d8
-long_desc="
- Bison is the GNU replacement for yacc(1). Some programs depend on
- extensions present in Bison."
-
-bison25_package() {
-	provides="bison-2.5.1"
-	conflicts="bison>=0"
-	depends="m4"
-	pkg_install() {
-		vmove usr
-	}
-}
--- a/srcpkgs/chromium/patches/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
+++ b/srcpkgs/chromium/patches/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
@ -1,12 +1,13 @@
--- chromium-23.0.1271.95/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h	2012-07-10 10:48:31.000000000 +0300
-+++ chromium-23.0.1271.95/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h	2012-07-11 23:44:11.000000000 +0300
+diff -upr third_party/tcmalloc/chromium/src/base/linux_syscall_support.h third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
+--- third_party/tcmalloc/chromium/src/base/linux_syscall_support.h	2012-07-10 10:48:31.000000000 +0300
+++ third_party/tcmalloc/chromium/src/base/linux_syscall_support.h	2012-07-11 23:44:11.000000000 +0300
@@ -243,14 +243,13 @@ struct kernel_rusage {
   long               ru_nivcsw;
 };
-
+ 
 -struct siginfo;
 #if defined(__i386__) || defined(__arm__) || defined(__PPC__)
-
+ 
 /* include/asm-{arm,i386,mips,ppc}/signal.h                                  */
 struct kernel_old_sigaction {
   union {
--- a/srcpkgs/chromium/patches/chromium-speech-dispatcher-0.8-r0.patch
+++ b/srcpkgs/chromium/patches/chromium-speech-dispatcher-0.8-r0.patch
@ -0,0 +1,11 @@
+--- build/linux/system.gyp.orig	2013-04-02 00:42:20.645560574 +0000
+++ build/linux/system.gyp	2013-04-02 00:43:15.615870417 +0000
+@@ -491,7 +491,7 @@
+                      '--name', 'LibSpeechdLoader',
+                      '--output-h', '<(output_h)',
+                      '--output-cc', '<(output_cc)',
+-                     '--header', '<libspeechd.h>',
+                     '--header', '<speech-dispatcher/libspeechd.h>',
+                      '--link-directly=<(linux_link_libspeechd)',
+                      'spd_open',
+                      'spd_say',
--- a/srcpkgs/chromium/patches/chromium_fix_json_headers.patch
+++ b/srcpkgs/chromium/patches/chromium_fix_json_headers.patch
@ -0,0 +1,38 @@
+--- third_party/jsoncpp/jsoncpp.gyp.orig	2013-04-22 21:42:14.720741254 +0400
+++ third_party/jsoncpp/jsoncpp.gyp	2013-04-22 21:42:55.616648298 +0400
+@@ -52,15 +52,15 @@
+           'variables': {
+             'headers_root_path': 'source/include',
+             'header_filenames': [
+-              'json/assertions.h',
+-              'json/autolink.h',
+-              'json/config.h',
+-              'json/features.h',
+-              'json/forwards.h',
+-              'json/json.h',
+-              'json/reader.h',
+-              'json/value.h',
+-              'json/writer.h',
+              'jsoncpp/json/assertions.h',
+              'jsoncpp/json/autolink.h',
+              'jsoncpp/json/config.h',
+              'jsoncpp/json/features.h',
+              'jsoncpp/json/forwards.h',
+              'jsoncpp/json/json.h',
+              'jsoncpp/json/reader.h',
+              'jsoncpp/json/value.h',
+              'jsoncpp/json/writer.h',
+             ],
+           },
+           'includes': [
+--- third_party/libjingle/source/talk/base/json.h.orig	2013-04-22 23:06:06.051857164 +0400
+++ third_party/libjingle/source/talk/base/json.h	2013-04-22 23:06:13.860853852 +0400
+@@ -32,7 +32,7 @@
+ #include <vector>
+ 
+ #ifdef JSONCPP_RELATIVE_PATH
+-#include "json/json.h"
+#include "jsoncpp/json/json.h"
+ #else
+ #include "third_party/jsoncpp/json.h"
+ #endif
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@ -1,23 +1,15 @@
 # Template file for 'chromium'
-#
-# Disable NaCL for now, broken with glibc-2.16.
-#_build_nacl=1
 pkgname=chromium
-version=23.0.1271.95
-patch_args="-Np0"
-revision=2
+#See http://www.chromium.org/developers/calendar for the latest version
+version=26.0.1410.63
+revision=1
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.chromium.org/"
 license="BSD"
 _url_base="http://commondatastorage.googleapis.com"
-distfiles="${_url_base}/chromium-browser-official/${pkgname}-${version}.tar.bz2"
-checksum="30097d21dfff134cbdc0ebe6bb848558d4854f725322aa26b25f83741279f13c"
-
-if [ -n "${_build_nacl}" ]; then
- distfiles="${distfiles} ${_url_base}/nacl/nacl_sdk/${version}/naclsdk_linux.tar.bz2"
- checksum="${checksum} 85d0a9e2903a1d82b40c5e5a54350df6a5171eb1831f42e1f0e22f3a42e3ca13"
-fi
+distfiles="${_url_base}/${pkgname}-browser-official/${pkgname}-${version}.tar.xz"
+checksum="7af8f70745992afdee0196039b5beab1b86b6de7fa70ca4f4a04dc335f034b3f"

 long_desc="
 Chromium is an open-source browser project that aims to build a safer,
@ -28,69 +20,50 @@ long_desc="
 auto-updater system."

 disable_debug=yes
-wrksrc=${pkgname}
-create_wrksrc=yes
-create_srcdir=yes
-build_wrksrc=${pkgname}-${version}

-makedepends="pkg-config which unzip yasm bison25 flex gperf perl python
- libudev-devel>=138 libpng-devel>=1.5.10 libgcrypt-devel elfutils-devel
- mit-krb5-devel libXrender-devel libXScrnSaver-devel libXcomposite-devel
- libX11-devel libXi-devel gtk+-devel libevent-devel nss-devel alsa-lib-devel
- dbus-glib-devel libXdamage-devel libXtst-devel pam-devel libgnome-keyring-devel
- libvpx-devel speex-devel libwebp-devel>=0.2.0 pulseaudio-devel cups-devel
- hunspell-devel libflac-devel icu-devel libxslt-devel libusb-devel v8-devel
- libXrandr-devel"
+makedepends="python pkg-config gtk+-devel nss-devel GConf-devel pciutils-devel
+ libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
+ libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
+ gperf bison libXScrnSaver-devel alsa-lib-devel icu-devel which protobuf-devel
+ libxml2-devel libxslt-devel sqlite-devel yasm opus-devel ffmpeg-devel
+ libvpx-devel libflac-devel speex-devel libusb-devel libmtp-devel
+ libjpeg-turbo-devel libevent-devel v8-devel json-c-devel re2-devel
+ libwebp-devel minizip-devel libsrtp-devel jsoncpp-devel"

-if [ "$XBPS_MACHINE" = "x86_64" ]; then
-	makedepends+=" gcc-multilib"
-fi
-
-pre_configure() {
-	# http://code.google.com/p/chromium/issues/detail?id=109527
-	sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
-
-	if [ -n "${_build_nacl}" ]; then
-		ln -s ${wrksrc}/pepper_${version%%.*}/toolchain/linux_x86_newlib \
-			native_client/toolchain/linux_x86_newlib
-	fi
-}

 do_configure() {
-	if [ -z "${_build_nacl}" ]; then
-		_nacl="-Ddisable_nacl=1"
-	fi
+	unset LD LDFLAGS

-	build/gyp_chromium -f make build/all.gyp --depth=. \
-		-Dwerror= \
-		-Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
-		-Drelease_extra_cflags="$CFLAGS" \
-		-Dlinux_use_gold_binary=0 \
-		-Dlinux_use_gold_flags=0 \
-		-Dffmpeg_branding=Chrome \
-		-Dproprietary_codecs=1 \
-		-Duse_system_libjpeg=1 \
-		-Duse_system_bzip2=1 \
-		-Duse_system_flac=1 \
-		-Duse_system_icu=1  \
-		-Duse_system_libevent=1 \
-		-Duse_system_libjpeg=1 \
-		-Duse_system_libpng=1 \
-		-Duse_system_libusb=1 \
-		-Duse_system_libwebp=1 \
-		-Duse_system_libxml=1 \
-		-Duse_system_speex=1 \
-		-Duse_system_v8=1 \
-		-Duse_system_xdg_utils=1 \
-		-Duse_system_yasm=1 \
-		-Duse_system_vpx=1 \
-		-Duse_system_xdg_utils=1 \
-		-Duse_system_nss=1 \
-		-Duse_system_ssl=0 \
-		-Duse_system_sqlite=0 \
-		-Duse_gconf=0 \
-		-Dlinux_use_tcmalloc=0 \
-		-Dlinux_link_gsettings=1 ${_nacl}
+	# TODO
+	# See https://crbug.com/28287
+	# use_system_libsrtp=1 (check if https://bugs.gentoo.org/show_bug.cgi?id=459932 reproducible)
+	# use_system_libvpx=1 (http://crbug.com/174287 fixed for chromium-27)
+	# use_system_v8=1 (http://crbug.com/29050 fixed for chromium-27) 
+	# use_system_ffmpeg=1 (most likely libvpx-related, check on chromium-27)
+	# use_system_mesa=1 (http://crbug.com/161389 fixed for chromium-27)
+	# disable_pnacl=0 (http://crbug.com/224169)
+	# use_system_sqlite=1 (http://crbug.com/22208)
+	# use_system_ssl=1 (http://crbug.com/58087)
+	# use_system_tcmalloc=1 (https://crbug.com/174634 WontFix?)
+	# use_system_hyphen=1 (http://crbug.com/176285)
+	# use_system_hunspell=1 (likely https://crbug.com/24517)
+
+
+	build/gyp_chromium -f make build/all.gyp --depth=. -Dwerror= \
+	 -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 \
+	 -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+	 -Ddisable_sse2=1 -Drelease_extra_cflags="$CFLAGS" \
+	 -Dffmpeg_branding=Chrome -Dproprietary_codecs=1 \
+	 -Duse_gconf=0 -Dlinux_use_tcmalloc=0 -Dlinux_link_gsettings=1 \
+	 -Ddisable_nacl=1 -Duse_system_bzip2=1 -Duse_system_expat=1 \
+	 -Duse_system_flac=1 -Duse_system_harfbuzz=1 -Duse_system_icu=1 \
+	 -Duse_system_jsoncpp=1 -Duse_system_libevent=1 -Duse_system_libexif=1 \
+	 -Duse_system_libjpeg=1 -Duse_system_libmtp=1 -Duse_system_libpng=1 \
+	 -Duse_system_libsrtp=1 -Duse_system_libusb=1 -Duse_system_libwebp=1 \
+	 -Duse_system_libxml=1 -Duse_system_minizip=1 \
+	 -Duse_system_nspr=1 -Duse_system_opus=1 -Duse_system_protobuf=1 \
+	 -Duse_system_re2=1 -Duse_system_speex=1 -Duse_system_stlport=1 \
+	 -Duse_system_yasm=1 -Duse_system_zlib=1 -Duse_system_xdg=1
 }

 do_build() {
@ -103,12 +76,6 @@ do_install() {

 	cp out/Release/{*.pak,libffmpegsumo.so} ${DESTDIR}/usr/lib/chromium

-	if [ -n "${_build_nacl}" ]; then
-		cp out/Release/{nacl_helper{,_bootstrap}} \
-			out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
-			${DESTDIR}/usr/lib/chromium
-	fi
-
 	cp -a out/Release/locales ${DESTDIR}/usr/lib/chromium

 	vinstall out/Release/chrome.1 644 usr/share/man/man1 chromium.1
--- a/srcpkgs/dotconf-devel
+++ b/srcpkgs/dotconf-devel
@ -0,0 +1 @@
+dotconf
--- a/srcpkgs/dotconf/template
+++ b/srcpkgs/dotconf/template
@ -0,0 +1,33 @@
+# Template build file for 'dotconf'.
+pkgname=dotconf
+version=1.3
+revision=1
+build_style=gnu-configure
+wrksrc=williamh-${pkgname}-4cd7b3a
+hostmakedepends="automake libtool"
+short_desc="A C library for parsing configuration files"
+maintainer="ojab <ojab@ojab.ru>"
+license="LGPL2.1"
+homepage="https://github.com/williamh/dotconf"
+checksum=d7c5eab8e9785ea0186676f0ccc4261e196b7559943030f869169eb748d34178
+distfiles="https://github.com/williamh/${pkgname}/tarball/v${version}"
+
+pre_configure() {
+	autoreconf -i
+}
+
+dotconf_package() {
+	pkg_install() {
+		vmove all
+	}
+}
+
+dotconf-devel_package() {
+	short_desc="${short_desc} -- development files"
+	depends="${sourcepkg}-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@ -16,9 +16,9 @@ libmagic_package() {
 	short_desc="File type identification library"
 	replaces="file<5.12"
 	pkg_install() {
-		vmove "usr/lib/*.so*" usr/lib
-		vmove usr/share/misc usr/share
-		vmove usr/share/man/man4 usr/share/man
+		vmove "usr/lib/*.so*"
+		vmove usr/share/misc
+		vmove usr/share/man/man4
 	}
 }

@ -26,9 +26,9 @@ file-devel_package() {
 	depends="zlib-devel libmagic>=${version}"
 	short_desc="File type identification library -- development files"
 	pkg_install() {
-		vmove usr/include usr
-		vmove "usr/lib/*.a" usr/lib
-		vmove usr/share/man/man3 usr/share/man
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/share/man/man3
 	}
 }

--- a/srcpkgs/jsoncpp-devel
+++ b/srcpkgs/jsoncpp-devel
@ -0,0 +1 @@
+jsoncpp/
--- a/srcpkgs/jsoncpp/files/jsoncpp.pc
+++ b/srcpkgs/jsoncpp/files/jsoncpp.pc
@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: jsoncpp
+Description: API for manipulating JSON
+Version: 0.6.0
+URL: http://jsoncpp.sourceforge.net/
+Libs: -L${libdir} -ljsoncpp
+Cflags: -I${includedir}/jsoncpp/
--- a/srcpkgs/jsoncpp/patches/jsoncpp_cross-compile.patch
+++ b/srcpkgs/jsoncpp/patches/jsoncpp_cross-compile.patch
@ -0,0 +1,16 @@
+--- SConstruct.orig	2010-03-13 13:59:50.000000000 +0300
+++ SConstruct	2013-04-23 19:31:39.042439981 +0400
+@@ -119,6 +119,13 @@
+     env.Append( CPPDEFINES=[ "WIN32", "NDEBUG", "_MT" ] )
+ elif platform.startswith('linux-gcc'):
+     env.Tool( 'default' )
+    env.Replace(AS = os.environ['AS'])
+    env.Replace(AR = os.environ['AR'])
+    env.Replace(NM = os.environ['NM'])
+    env.Replace(CPP = os.environ['CPP'])
+    env.Replace(LD = os.environ['LD'])
+    env.Replace(CXX = os.environ['CXX'])
+    env.Replace(GCC = os.environ['GCC'])
+     env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" )
+     env['SHARED_LIB_ENABLED'] = True
+ else:
--- a/srcpkgs/jsoncpp/template
+++ b/srcpkgs/jsoncpp/template
@ -0,0 +1,50 @@
+# Template build file for 'jsoncpp'.
+pkgname=jsoncpp
+version=0.6.0rc2
+_srcversion=0.6.0-rc2
+revision=1
+hostmakedepends="scons"
+wrksrc="${pkgname}-src-${_srcversion}"
+short_desc="A JSON implementation in C++"
+maintainer="ojab@ojab.ru"
+license="Public Domain or MIT"
+homepage="http://sourceforge.net/projects/${pkgname}"
+distfiles="http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${_srcversion}/${pkgname}-src-${_srcversion}.tar.gz"
+checksum=d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283
+
+do_build() {
+	sed -i SConstruct -e "s/g++/${CXX}/g"
+	scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " \
+		DESTDIR="${DESTDIR}" platform=linux-gcc
+	${CXX} -o libjsoncpp.so.0.0.0 -shared -Wl,-soname,libjsoncpp.so.0 \
+		buildscons/linux-gcc-*/src/lib_json/*.os -lpthread
+}
+
+do_install() {
+	vmkdir usr/lib
+	cp libjsoncpp.so.0.0.0 ${DESTDIR}/usr/lib/
+	ln -sf libjsoncpp.so.0.0.0 ${DESTDIR}/usr/lib/libjsoncpp.so
+	ln -sf libjsoncpp.so.0.0.0 ${DESTDIR}/usr/lib/libjsoncpp.so.0
+	vmkdir usr/include/jsoncpp/json
+	install -p -m 0644 include/json/*.h ${DESTDIR}/usr/include/jsoncpp/json
+}
+
+
+post_install() {
+	vinstall ${FILESDIR}/jsoncpp.pc 644 usr/lib/pkgconfig
+}
+
+jsoncpp_package() {
+	pkg_install() {
+		vmove all
+	}
+}
+
+jsoncpp-devel_package() {
+	depends="jsoncpp>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@ -13,7 +13,7 @@ distfiles="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz
 checksum=e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f

 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends=+= "pam-devel"
+	hostmakedepends+=" pam-devel"
 fi

 do_build() {
--- a/srcpkgs/libsrtp-devel
+++ b/srcpkgs/libsrtp-devel
@ -0,0 +1 @@
+libsrtp/
--- a/srcpkgs/libsrtp/files/libsrtp.pc
+++ b/srcpkgs/libsrtp/files/libsrtp.pc
@ -0,0 +1,14 @@
+prefix=@PREFIX@
+exec_prefix=@PREFIX@
+libdir=@LIBDIR@
+includedir=@INCLUDEDIR@
+
+Name: libsrtp
+Description: Secure Real-time Transport Protocol library
+Version: 1.4.4
+URL: http://srtp.sourceforge.net
+Requires:
+Conflicts:
+Libs: -L${libdir} -lsrtp
+Libs.private:
+Cflags: -I${includedir}/srtp/
--- a/srcpkgs/libsrtp/patches/libsrtp-1.4.4-shared.patch
+++ b/srcpkgs/libsrtp/patches/libsrtp-1.4.4-shared.patch
@ -0,0 +1,75 @@
+diff -up srtp/Makefile.in.shared srtp/Makefile.in
+--- Makefile.in.shared	2010-05-21 13:45:35.000000000 -0400
+++ Makefile.in	2010-10-04 15:53:29.132116130 -0400
+@@ -8,7 +8,7 @@
+ # runtest       runs test applications 
+ # test		builds test applications
+ # libcrypt.a	static library implementing crypto engine
+-# libsrtp.a	static library implementing srtp
+# libsrtp.so	shared library implementing srtp
+ # clean		removes objects, libs, and executables
+ # distribution  cleans and builds a .tgz
+ # tags          builds etags file from all .c and .h files
+@@ -97,13 +97,13 @@ kernel  = crypto/kernel/crypto_kernel.o 
+ 
+ cryptobj =  $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay)
+ 
+-# libsrtp.a (implements srtp processing)
+# libsrtp (implements srtp processing)
+ 
+ srtpobj = srtp/srtp.o srtp/ekt.o
+ 
+-libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
+-	ar cr libsrtp.a $^
+-	$(RANLIB) libsrtp.a
+libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
+	$(COMPILE) -shared -pthread -lm -Wl,--no-undefined -Wl,-soname,$@.0 -z noexecstack -o $@.0.0.0 $^
+	ln -s $@.0.0.0 $@	
+ 
+ # libcryptomath.a contains general-purpose routines that are used to
+ # generate tables and verify cryptoalgorithm implementations - this
+@@ -127,19 +127,19 @@ testapp = $(crypto_testapp) test/srtp_dr
+ 	  test/roc_driver$(EXE) test/rdbx_driver$(EXE) test/rtpw$(EXE) \
+ 	  test/dtls_srtp_driver$(EXE)
+ 
+-$(testapp): libsrtp.a
+$(testapp): libsrtp.so
+ 
+ test/rtpw$(EXE): test/rtpw.c test/rtp.c test/getopt_s.c
+-	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+	$(COMPILE) $(LDFLAGS) -o $@ test/rtpw.c test/rtp.c test/getopt_s.c $(LIBS) $(SRTPLIB)
+ 
+ test/srtp_driver$(EXE): test/srtp_driver.c test/getopt_s.c
+-	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+	$(COMPILE) $(LDFLAGS) -o $@ test/srtp_driver.c test/getopt_s.c $(LIBS) $(SRTPLIB)
+ 
+ test/rdbx_driver$(EXE): test/rdbx_driver.c test/getopt_s.c
+-	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+	$(COMPILE) $(LDFLAGS) -o $@ test/rdbx_driver.c test/getopt_s.c $(LIBS) $(SRTPLIB)
+ 
+ test/dtls_srtp_driver$(EXE): test/dtls_srtp_driver.c test/getopt_s.c
+-	$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+	$(COMPILE) $(LDFLAGS) -o $@ test/dtls_srtp_driver.c test/getopt_s.c $(LIBS) $(SRTPLIB)
+ 
+ test: $(testapp)
+ 	@echo "Build done. Please run '$(MAKE) runtest' to run self tests."
+@@ -197,16 +197,16 @@ install:
+ 	cp $(srcdir)/include/*.h $(DESTDIR)$(includedir)/srtp  
+ 	cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
+ 	if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
+-	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
+	if [ -f libsrtp.so.0.0.0 ]; then cp libsrtp.so.0.0.0 $(DESTDIR)$(libdir)/; fi
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(includedir)/srtp/*.h
+-	rm -f $(DESTDIR)$(libdir)/libsrtp.a
+	rm -f $(DESTDIR)$(libdir)/libsrtp.so*
+ 	-rmdir $(DESTDIR)$(includedir)/srtp
+ 
+ clean:
+ 	rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \
+-        libcryptomath.a libsrtp.a core *.core test/core
+        libcryptomath.a libsrtp.so* core *.core test/core
+ 	for a in * */* */*/*; do			\
+               if [ -f "$$a~" ] ; then rm -f $$a~; fi;	\
+         done;
--- a/srcpkgs/libsrtp/template
+++ b/srcpkgs/libsrtp/template
@ -0,0 +1,39 @@
+# Template build file for 'libsrtp'.
+pkgname=libsrtp
+version=1.4.4
+revision=1
+build_style=gnu-configure
+wrksrc=srtp
+short_desc="Library implementing SRTP, the Secure Real-time Transport Protocol"
+long_desc="libsrtp is a library implementing Secure RTP, the Secure Real-time
+ Transport Protocol. RTP is used for Voice over IP (VoIP) as well as audio and
+ video streaming; SRTP adds confidentialtiy and authentication."
+maintainer="ojab <ojab@ojab.ru>"
+license="BSD"
+homepage="http://sourceforge.net/projects/srtp/"
+checksum=ac91a00c4eed0c111a94dfa5295a32af82cdd26c1c7f58f317b1062f0beb923b
+#Use fedora's cvs checkout for the good
+distfiles="http://pkgs.fedoraproject.org/repo/pkgs/libsrtp/srtp-1.4.4-20101004cvs.tar.bz2/160479555f5e95027ad318605c1c670c/srtp-1.4.4-20101004cvs.tar.bz2"
+
+XBPS_CFLAGS+=" -fPIC"
+
+post_install() {
+	vinstall ${FILESDIR}/libsrtp.pc 644 usr/lib/pkgconfig
+	ln -sf libsrtp.so.0.0.0 ${DESTDIR}/usr/lib/libsrtp.so
+	ln -sf libsrtp.so.0.0.0 ${DESTDIR}/usr/lib/libsrtp.so.0
+}
+
+libsrtp_package() {
+	pkg_install() {
+		vmove all
+	}
+}
+
+libsrtp-devel_package() {
+	short_desc="${short_desc} -- development files"
+	depends="${sourcepkg}-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@ -13,7 +13,7 @@ distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz"
 checksum=f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a

 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="automake gettext-devel python-devel"
+	hostmakedepends="automake libtool gettext-devel python-devel"
 	pre_configure() {
 		sed -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" -i configure.in
 		autoreconf -fi
--- a/srcpkgs/minizip-devel
+++ b/srcpkgs/minizip-devel
@ -0,0 +1 @@
+minizip/
--- a/srcpkgs/minizip/template
+++ b/srcpkgs/minizip/template
@ -0,0 +1,34 @@
+# Template build file for 'minizip'.
+pkgname=minizip
+version=1.2.7
+revision=1
+build_style=gnu-configure
+wrksrc=zlib-${version}/contrib/${pkgname}
+hostmakedepends="automake libtool"
+makedepends="zlib-devel"
+short_desc="A C library for parsing configuration files"
+maintainer="ojab <ojab@ojab.ru>"
+license="zlib"
+homepage="http://www.winimage.com/zLibDll/minizip.html"
+distfiles="http://www.zlib.net/zlib-$version.tar.bz2"
+checksum=49e2e9658dfb036900da6ea0267a737fa3c4eee6666776d378c79d52e9334934
+
+pre_configure() {
+	autoreconf -i
+}
+
+minizip_package() {
+	pkg_install() {
+		vmove all
+	}
+}
+
+minizip-devel_package() {
+	short_desc="${short_desc} -- development files"
+	depends="${sourcepkg}-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
--- a/srcpkgs/qemu-kvm/INSTALL
+++ b/srcpkgs/qemu-kvm/INSTALL
@ -1,18 +0,0 @@
-case "${ACTION}" in
-post)
-	cat <<_EOF
-==========================================================================
-
-To use KVM your user must be added to the 'wheel' group:
-
-	$ usermod -aG wheel <username>
-
-Don't forget to load the appropiate KVM module for your CPU:
-
-	$ modprobe kvm-amd # for AMD CPUs
-	$ modprobe kvm-intel # for Intel CPUs
-
-==========================================================================
-_EOF
-	;;
-esac
--- a/srcpkgs/qemu-kvm/files/65-kvm.rules
+++ b/srcpkgs/qemu-kvm/files/65-kvm.rules
@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="wheel", MODE="0660"
--- a/srcpkgs/qemu-kvm/template
+++ b/srcpkgs/qemu-kvm/template
@ -1,48 +0,0 @@
-# Template file for 'qemu-kvm'
-pkgname=qemu-kvm
-version=1.2.0
-revision=5
-build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-spice
--enable-kvm --audio-drv-list=alsa,sdl,pa --disable-xen
--enable-vhost-net --enable-vnc-png --enable-vnc-tls 
--enable-virtfs --disable-fdt --enable-vde --enable-seccomp"
-makedepends="perl python attr-devel libpng-devel>=1.5.10 libjpeg-turbo-devel ncurses-devel
- libuuid-devel libX11-devel alsa-lib-devel gnutls-devel>=3.1.5 SDL-devel libbluetooth-devel
- libsasl-devel spice-protocol spice-devel glib-devel MesaLib-devel pulseaudio-devel
- libcurl-devel xfsprogs-devel libcap-ng-devel libcap-devel vde2-devel nss-devel
- libtool libseccomp-devel"
-short_desc="Open Source Processor Emulator -- KVM version"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://www.linux-kvm.org"
-license="GPL-2, LGPL-2.1"
-distfiles="${SOURCEFORGE_SITE}/kvm/$pkgname-$version.tar.gz"
-checksum=e98ab96c24337e312864f2341016695ac11cb9a04be83548a8da89596d591b05
-
-post_install() {
-	# symbolic link for backwards compatibility
-	ln -s qemu-system-x86_64 ${DESTDIR}/usr/bin/qemu-kvm
-	# symbolic link for to qemu binary for emulator apps
-	ln -s qemu-system-x86_64 ${DESTDIR}/usr/bin/qemu
-	# symbolic link for to qemu binary for emulator apps
-	ln -s qemu-system-x86_64 ${DESTDIR}/usr/bin/kvm
-	# fix man page
-	mv ${DESTDIR}/usr/share/man/man1/qemu.1 \
-		${DESTDIR}/usr/share/man/man1/qemu-kvm.1
-
-	vinstall ${FILESDIR}/65-kvm.rules 644 usr/lib/udev/rules.d
-	# qemu-bridge-helper must be setuid for non privileged users.
-	chmod u+s ${DESTDIR}/usr/libexec/qemu-bridge-helper
-}
-
-qemu-kvm_package() {
-	conf_files="/etc/qemu/target-x86_64.conf"
-	replaces="qemu>=0"
-	provides="qemu-${version}"
-	conflicts="qemu>=0"
-	nostrip=yes
-	pkg_install() {
-		vmove etc
-		vmove usr
-	}
-}
--- a/srcpkgs/re2-devel
+++ b/srcpkgs/re2-devel
@ -0,0 +1 @@
+re2/
--- a/srcpkgs/re2/patches/re2-cross-compile.patch
+++ b/srcpkgs/re2/patches/re2-cross-compile.patch
@ -0,0 +1,31 @@
+--- Makefile.orig	2012-10-21 17:15:03.000000000 +0400
+++ Makefile	2013-04-23 19:42:13.789582841 +0400
+@@ -9,13 +9,13 @@
+ # CCPCRE=-I/usr/local/include -DUSEPCRE
+ # LDPCRE=-L/usr/local/lib -lpcre
+ 
+-CXX=g++
+-CXXFLAGS=-Wall -O3 -g -pthread  # can override
+-RE2_CXXFLAGS=-Wno-sign-compare -c -I. $(CCPCRE)  # required
+-LDFLAGS=-pthread
+-AR=ar
+CXX?=g++
+CXXFLAGS?=-Wall -O3 -g -pthread  # can override
+RE2_CXXFLAGS?=-Wno-sign-compare -c -I. $(CCPCRE)  # required
+LDFLAGS?=-pthread
+AR?=ar
+ ARFLAGS=rsc
+-NM=nm
+NM?=nm
+ NMFLAGS=-p
+ 
+ # Variables mandated by GNU, the arbiter of all good taste on the internet.
+@@ -25,7 +25,7 @@
+ bindir=$(exec_prefix)/bin
+ includedir=$(prefix)/include
+ libdir=$(exec_prefix)/lib
+-INSTALL=install
+INSTALL?=install
+ INSTALL_PROGRAM=$(INSTALL)
+ INSTALL_DATA=$(INSTALL) -m 644
+ 
--- a/srcpkgs/re2/patches/re2-symbols-r0.patch
+++ b/srcpkgs/re2/patches/re2-symbols-r0.patch
@ -0,0 +1,10 @@
+--- libre2.symbols.orig	2012-11-07 04:45:57.000000000 +0100
+++ libre2.symbols	2012-11-07 04:46:20.000000000 +0100
+@@ -10,6 +10,7 @@
+ 		_ZlsRSoRKN3re211StringPieceE;
+ 		# re2::FilteredRE2*
+ 		_ZN3re211FilteredRE2*;
+		_ZNK3re211FilteredRE2*;
+ 	local:
+ 		*;
+ };
--- a/srcpkgs/re2/template
+++ b/srcpkgs/re2/template
@ -0,0 +1,28 @@
+# Template build file for 're2'.
+pkgname=re2
+version=20130115
+revision=1
+build_style=gnu-makefile
+make_install_args="prefix=/usr"
+wrksrc=re2
+short_desc="An efficient, principled regular expression library"
+maintainer="ojab <ojab@ojab.ru>"
+license="LGPL2.1"
+homepage="https://code.google.com/p/re2/"
+checksum=a95d83ed8203817587f7cc368b6f7199d8a4b1558372c306b07201058b92e1fe
+distfiles="https://${pkgname}.googlecode.com/files/${pkgname}-${version}.tgz"
+
+re2_package() {
+	pkg_install() {
+		vmove all
+	}
+}
+
+re2-devel_package() {
+	short_desc="${short_desc} -- development files"
+	depends="${sourcepkg}-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
--- a/srcpkgs/speech-dispatcher-devel
+++ b/srcpkgs/speech-dispatcher-devel
@ -0,0 +1 @@
+speech-dispatcher
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@ -0,0 +1,44 @@
+# Template build file for 'speech-dispatcher'.
+pkgname=speech-dispatcher
+version=0.8
+revision=1
+build_style=gnu-configure
+short_desc="High-level device independent layer for speech synthesis interface"
+maintainer="ojab <ojab@ojab.ru>"
+license="GPL2/FDL"
+homepage="http://devel.freebsoft.org/speechd"
+checksum=0a6ce544cfbac8592a8ea08e3ab24c389153904ea51c6fd68756cea52de9efa2
+distfiles="http://devel.freebsoft.org/pub/projects/speechd/${pkgname}-${version}.tar.gz"
+makedepends="intltool libltdl-devel pkg-config glib-devel dotconf-devel"
+
+speech-dispatcher_package() {
+	conf_files="
+		/etc/speech-dispatcher/speechd.conf
+		/etc/speech-dispatcher/clients/emacs.conf
+		/etc/speech-dispatcher/clients/gnome-speech.conf
+		/etc/speech-dispatcher/modules/ibmtts.conf
+		/etc/speech-dispatcher/modules/espeak-mbrola-generic.conf
+		/etc/speech-dispatcher/modules/ivona.conf
+		/etc/speech-dispatcher/modules/festival.conf
+		/etc/speech-dispatcher/modules/swift-generic.conf
+		/etc/speech-dispatcher/modules/espeak-generic.conf
+		/etc/speech-dispatcher/modules/flite.conf
+		/etc/speech-dispatcher/modules/llia_phon-generic.conf
+		/etc/speech-dispatcher/modules/dtk-generic.conf
+		/etc/speech-dispatcher/modules/epos-generic.conf
+		/etc/speech-dispatcher/modules/espeak.conf
+		/etc/speech-dispatcher/modules/cicero.conf"
+	pkg_install() {
+		vmove all
+	}
+}
+
+speech-dispatcher-devel_package() {
+	short_desc="${short_desc} -- development files"
+	depends="${sourcepkg}-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@ -13,7 +13,7 @@ distfiles="ftp://ftp.remotesensing.org/pub/libtiff/$pkgname-$version.tar.gz"
 checksum=ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872

 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="automake"
+	hostmakedepends="automake libtool"
 	pre_configure() {
 		autoreconf -fi
 	}
--- a/srcpkgs/webkit-gtk/template
+++ b/srcpkgs/webkit-gtk/template
@ -1,13 +1,13 @@
 # Template file for 'webkit-gtk'
 pkgname=webkit-gtk
 version=1.10.2
-revision=3
+revision=4
 wrksrc="webkitgtk-${version}"
 build_style=gnu-configure
-configure_args="--enable-jit --with-font-backend=freetype
+configure_args="--enable-jit --with-font-backend=freetype --with-gtk=2.0
 --enable-introspection --disable-webkit2 --with-unicode-backend=icu
 --disable-schemas-compile --disable-silent-rules"
-makedepends="perl pkg-config intltool which gperf bison25 flex
+makedepends="perl pkg-config intltool which gperf bison flex libXcomposite-devel
 libjpeg-turbo-devel libpng-devel>=1.5.10 sqlite-devel gtk+-devel
 libXt-devel gst-plugins-base-devel libsoup-devel libxslt-devel icu-devel>=49
 enchant-devel dbus-glib-devel geoclue-devel gobject-introspection ruby"
--- a/srcpkgs/xcb-proto/template
+++ b/srcpkgs/xcb-proto/template
@ -3,7 +3,8 @@ pkgname=xcb-proto
 version=1.8
 revision=2
 build_style=gnu-configure
-makedepends="python libxml2"
+hostmakedepends="python"
+makedepends="libxml2"
 short_desc="XML-XCB (X C Bindings) protocol descriptions"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xcb.freedesktop.org"