From fcd3c8e9e8cd248ce99caf5550a20126f2bd7e65 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 23 Mar 2012 07:05:21 +0100
Subject: [PATCH] gnutls: update to 2.12.18.

---
 srcpkgs/gnutls/depends               |  2 +-
 srcpkgs/gnutls/gnutls-devel.template | 25 +++++++++----------------
 srcpkgs/gnutls/gnutls-tools.template |  5 ++---
 srcpkgs/gnutls/template              |  4 ++--
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/gnutls/depends b/srcpkgs/gnutls/depends
index b7d8ad23d64..12ddcfbb101 100644
--- a/srcpkgs/gnutls/depends
+++ b/srcpkgs/gnutls/depends
@@ -1,2 +1,2 @@
 abi_depends=">=2.6.6"
-api_depends="${abi_depends}"
+api_depends=">=2.12.18"
diff --git a/srcpkgs/gnutls/gnutls-devel.template b/srcpkgs/gnutls/gnutls-devel.template
index 9c001b968f6..d75151f557e 100644
--- a/srcpkgs/gnutls/gnutls-devel.template
+++ b/srcpkgs/gnutls/gnutls-devel.template
@@ -1,27 +1,20 @@
 # Template file for 'libgrypt-devel'.
 #
-short_desc="${short_desc} (development files)"
+short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libgpg-error-devel
-Add_dependency run libstdc++-devel
 Add_dependency run zlib-devel
-Add_dependency run readline-devel
+Add_dependency run p11-kit-devel
 Add_dependency run libtasn1-devel
 Add_dependency run libgcrypt-devel
-Add_dependency run lzo-devel
-Add_dependency run gnutls
+Add_dependency run gnutls ">=${version}"
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
-	mkdir -p ${DESTDIR}/usr/bin
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/share/info ${DESTDIR}/usr/share
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib	
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/man/man3 usr/share/man
+	vmove usr/share/info usr/share
 }
diff --git a/srcpkgs/gnutls/gnutls-tools.template b/srcpkgs/gnutls/gnutls-tools.template
index d63bfdc0107..5b9f9cd4c4d 100644
--- a/srcpkgs/gnutls/gnutls-tools.template
+++ b/srcpkgs/gnutls/gnutls-tools.template
@@ -6,7 +6,6 @@ long_desc="${long_desc}
  This package contains the tools that come with gnutls."
 
 do_install() {
-	mkdir -p ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1 ${DESTDIR}/usr/share/man
+	vmove usr/bin usr
+	vmove usr/share/man/man1 usr/share/man
 }
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 8dc8520fee9..388bb4c83ee 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,6 +1,6 @@
 # Template build file for 'gnutls'.
 pkgname=gnutls
-version=2.12.17
+version=2.12.18
 #distfiles="ftp://ftp.gnutls.org/pub/gnutls/gnutls-$version.tar.bz2"
 distfiles="http://mirror.symnds.com/software/GNU/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
@@ -9,7 +9,7 @@ short_desc="GNU Transport Layer Security library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/gnutls/"
 license="GPL-3, LGPL-2.1"
-checksum=588ad6b0901c789f2f6afcec88ac4d688801bf1a024c9afa08706bb8d9868bf3
+checksum=780b12e3f05191316390611a3d9d982d29ca3f3abc234517b2fc542064b6f07a
 long_desc="
  GnuTLS is a portable ANSI C based library which implements the TLS 1.0 and
  SSL 3.0 protocols. The library does not include any patented algorithms and