From 2aebe3670bae620401ecb68484d321dc0d0044cf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 5 Jun 2012 11:48:58 +0200
Subject: [PATCH] mit-krb5: update to 1.10.2.

---
 srcpkgs/mit-krb5/mit-krb5-client.template |  8 +++----
 srcpkgs/mit-krb5/mit-krb5-devel.template  | 22 +++++-------------
 srcpkgs/mit-krb5/mit-krb5-libs.template   |  9 +++-----
 srcpkgs/mit-krb5/template                 | 27 +++++++++--------------
 4 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/srcpkgs/mit-krb5/mit-krb5-client.template b/srcpkgs/mit-krb5/mit-krb5-client.template
index b10646d625b..936713d7648 100644
--- a/srcpkgs/mit-krb5/mit-krb5-client.template
+++ b/srcpkgs/mit-krb5/mit-krb5-client.template
@@ -5,9 +5,7 @@ long_desc="${long_desc}
 
  This package contains the client side programs."
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1 ${DESTDIR}/usr/share/man
+do_install() {
+	vmove usr/bin usr
+	vmove usr/share/man/man1 usr/share/man
 }
diff --git a/srcpkgs/mit-krb5/mit-krb5-devel.template b/srcpkgs/mit-krb5/mit-krb5-devel.template
index d46acd05c86..0b3aeef0129 100644
--- a/srcpkgs/mit-krb5/mit-krb5-devel.template
+++ b/srcpkgs/mit-krb5/mit-krb5-devel.template
@@ -1,24 +1,14 @@
 # Template file for 'mit-krb5-devel'.
 #
-depends="db-devel openssl-devel e2fsprogs-devel>=1.4.10_1 mit-krb5-libs"
+noarch=yes
+depends="db-devel openssl-devel e2fsprogs-devel>=1.4.10_1 mit-krb5-libs>=$version"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-noverifyrdeps=yes
-conflicts="heimdal-devel>=0"
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/{lib,bin} \
-		${DESTDIR}/usr/share/man/man1
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	for f in krb5-config; do
-		mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin
-		mv ${SRCPKGDESTDIR}/usr/share/man/man1/${f}* \
-			${DESTDIR}/usr/share/man/man1
-	done
+do_install() {
+	vmove usr/include usr
+	vmove usr/bin/krb5-config usr/bin
+	vmove "usr/share/man/man1/krb5-config*" usr/share/man/man1
 }
diff --git a/srcpkgs/mit-krb5/mit-krb5-libs.template b/srcpkgs/mit-krb5/mit-krb5-libs.template
index 5c4d462331b..2fdc0f92e76 100644
--- a/srcpkgs/mit-krb5/mit-krb5-libs.template
+++ b/srcpkgs/mit-krb5/mit-krb5-libs.template
@@ -1,15 +1,12 @@
 # Template file for 'mit-krb5-libs'.
 #
+conflicts="heimdal-libs>=0"
 short_desc="${short_desc} - shared libraries"
 long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-conflicts="heimdal-libs>=0"
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
+do_install() {
+	vmove "usr/lib/*.so*" usr/lib
 	chmod 755 ${DESTDIR}/usr/lib/*.so*
 }
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index eb40805f9ee..44769615a23 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -1,20 +1,23 @@
 # Template file for 'mit-krb5'
 pkgname=mit-krb5
-version=1.10.1
+version=1.10.2
+revision=1
+noextract=yes
 wrksrc="krb5-${version}"
-homepage="http://web.mit.edu/Kerberos"
-distfiles="$homepage/dist/krb5/1.10/krb5-$version-signed.tar"
 build_style=gnu-configure
 configure_script="./src/configure"
 configure_args="--disable-rpath --with-system-et
 --with-system-ss --with-system-db --enable-shared CFLAGS=-I/usr/include/et"
 depends="mit-krb5-client"
 makedepends="perl>=0 flex db-devel e2fsprogs-devel openssl-devel"
-revision=1
+subpackages="$pkgname-devel $pkgname-libs $pkgname-client"
+conflicts="heimdal>=0"
 short_desc="MIT Kerberos 5 implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
-checksum=d57fcef50e8f113907c3bd94f33db352600bce0f9f1b6d0c15a6d67d6ad62f0a
+homepage="http://web.mit.edu/Kerberos"
+distfiles="$homepage/dist/krb5/1.10/krb5-$version-signed.tar"
+checksum=52c719de1a7f042109486a80e7b69e43555186a2acf26c1e5ab83a3ab1cebe3d
 long_desc="
  Kerberos is a network authentication protocol. It is designed to provide
  strong authentication for client/server applications by using secret-key
@@ -22,19 +25,11 @@ long_desc="
  Massachusetts Institute of Technology. Kerberos is available in many
  commercial products as well."
 
-noextract=yes
-subpackages="$pkgname-devel $pkgname-libs $pkgname-client"
-conflicts="heimdal>=0"
-
-
-
 pre_configure() {
 	# We have to do this dance because the real distfile is
 	# included in the .tar archive.
-	tar xf ${XBPS_SRCDISTDIR}/$(basename ${distfiles}) \
-		-C ${wrksrc}
-	tar xfz ${wrksrc}/krb5-${version}.tar.gz \
-		-C ${XBPS_BUILDDIR}
+	tar xf $XBPS_SRCDISTDIR/$(basename $distfiles) -C $wrksrc
+	tar xfz $wrksrc/krb5-$version.tar.gz -C $XBPS_BUILDDIR
 	# Fix db plugin.
-	sed -i -e "s|<db.h>|<db_185.h>|" ${wrksrc}/src/plugins/kdb/db2/*.[ch]
+	sed -i -e "s|<db.h>|<db_185.h>|" $wrksrc/src/plugins/kdb/db2/*.[ch]
 }