From 3547c9f6383db90f81a27f7cf4e88f7b95450c02 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 20 Sep 2012 20:18:36 +0000
Subject: main/heimdal: split -libs, build fix and use system sqlite

- split libraries to subpackage, heimdal-libs
- parallel build fix. generate headers first
- force use of system sqlite
---
 main/heimdal/APKBUILD | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

(limited to 'main')

diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index f7c8071f53..f40abb61bf 100644
--- a/main/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
@@ -2,18 +2,19 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=heimdal
 pkgver=1.5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="An implementation of Kerberos 5"
 arch="all"
 url="http://www.h5l.org/"
 license="BSD"
 depends=
 depends_dev="openssl-dev e2fsprogs-dev db-dev"
-makedepends="autoconf automake bash db-dev e2fsprogs-dev>=1.41.9-r2 gawk libtool 
-	ncurses-dev openssl-dev perl pkgconfig readline-dev sqlite-dev"
+makedepends="$depends_dev autoconf automake bash gawk libtool
+	ncurses-dev perl readline-dev sqlite-dev"
 install=
-subpackages="$pkgname-doc $pkgname-dev $pkgname-ftp $pkgname-telnet \
-	$pkgname-su $pkgname-rsh $pkgname-rcp $pkgname-pagsh $pkgname-kf"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-libs
+	$pkgname-ftp $pkgname-telnet $pkgname-su $pkgname-rsh $pkgname-rcp
+	$pkgname-pagsh $pkgname-kf"
 source="http://ftp4.de.freesbie.org/pub/misc/heimdal/src/$pkgname-$pkgver.tar.gz
 	003_all_heimdal-rxapps.patch
 	005_all_heimdal-suid_fix.patch
@@ -58,9 +59,17 @@ build() {
 		--with-berkeley-db \
 		--with-readline-lib=/usr/lib \
 		--with-readline-include=/usr/include/readline \
+		--with-sqlite3=/usr \
 		--with-openssl=/usr || return 1
+
+	# make sure we use system version
+	rm -r lib/sqlite lib/com_err
+
 	# workarount a parallell build issue
+	make -C lib/asn1 der-protos.h der-private.h || return 1
 	make -C lib/kadm5 kadm5_err.h || return 1
+	make -C lib/krb5 krb5-protos.h krb5-private.h krb5_err.h krb_err.h \
+		heim_err.h k524_err.h || return 1
 	make || return 1
 }
 
@@ -126,6 +135,20 @@ package() {
 		"$pkgdir"/usr/share/licenses/$pkgname/ || return 1
 }
 
+libs() {
+	pkgdesc="Heimdal libraries"
+	replaces="heimdal"
+	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/sbin
+	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ || return 1
+	mv "$pkgdir"/usr/bin/string2key \
+		"$pkgdir"/usr/bin/verify_krb5_conf \
+		"$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/sbin/kdigest \
+		"$pkgdir"/usr/sbin/digest-service \
+		"$subpkgdir"/usr/sbin/ || return 1
+
+}
+
 ftp() {
 	mkdir -p $subpkgdir/usr/bin/
 	mv $pkgdir/usr/bin/kftp $subpkgdir/usr/bin/kftp
-- 
cgit v1.2.3