main/freeradius: move radclient to subpkg

1 files changed, 26 insertions, 13 deletions

diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index b2c33908bf..18885e498b 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -2,20 +2,20 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=freeradius
 pkgver=2.1.10
-pkgrel=20
+pkgrel=21
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="http://freeradius.org/"
 arch="all"
 license="GPL"
-depends=
+depends="freeradius-lib"
 makedepends="openssl-dev pth-dev mysql-dev postgresql-dev gdbm-dev readline-dev
 	bash libtool autoconf automake perl-dev python-dev openldap-dev unixodbc-dev"
 pkggroups="radiusd"
 pkgusers="radiusd"
 install="freeradius.pre-install"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-ldap $pkgname-mssql \
-	$pkgname-mysql $pkgname-oracle $pkgname-perl $pkgname-postgresql \
-	$pkgname-python $pkgname-unixodbc"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-ldap $pkgname-lib 
+	$pkgname-mssql $pkgname-mysql $pkgname-oracle $pkgname-perl 
+	$pkgname-postgresql $pkgname-python $pkgname-radclient $pkgname-unixodbc"
 source="ftp://ftp.freeradius.org/pub/freeradius/$pkgname-server-$pkgver.tar.gz
 	freeradius.confd
 	freeradius.initd
@@ -84,10 +84,11 @@ package() {
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/radiusd
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/radiusd
 	install -m644 -D scripts/logrotate.freeradius "$pkgdir"/etc/lorotate.d/$pkgname
+	find $pkgdir -iname *.la -delete
 }
 
 ldap() {
-	depends="freeradius"
+	depends="freeradius freeradius-lib"
 	mkdir -p $subpkgdir/etc/raddb
 	mv $pkgdir/etc/raddb/ldap.attrmap $subpkgdir/etc/raddb
 	mkdir -p $subpkgdir/etc/raddb/modules
@@ -96,8 +97,14 @@ ldap() {
 	mv $pkgdir/usr/lib/freeradius/rlm_ldap* $subpkgdir/usr/lib/freeradius
 }
 
+lib() {
+	mkdir -p $subpkgdir/usr/lib/freeradius
+	mv $pkgdir/usr/lib/freeradius/libfreeradius-radius-${pkgver}.so \
+	 $subpkgdir/usr/lib/freeradius
+}
+
 mysql() {
-	depends="freeradius"
+	depends="freeradius freeradius-lib"
 	mkdir -p $subpkgdir/etc/raddb/sql
 	mv $pkgdir/etc/raddb/sql/mysql $subpkgdir/etc/raddb/sql
 	mv $pkgdir/etc/raddb/sql/ndb $subpkgdir/etc/raddb/sql
@@ -106,21 +113,21 @@ mysql() {
 }
 
 mssql() {
-	depends="freeradius"
+	depends="freeradius freeradius-lib"
 	arch="noarch"
 	mkdir -p $subpkgdir/etc/raddb/sql
 	mv $pkgdir/etc/raddb/sql/mssql $subpkgdir/etc/raddb/sql
 }
 
 oracle() {
-	depends="freeradius"
+	depends="freeradius freeradius-lib"
 	arch="noarch"
 	mkdir -p $subpkgdir/etc/raddb/sql
 	mv $pkgdir/etc/raddb/sql/oracle $subpkgdir/etc/raddb/sql
 }
 
 perl() {
-	depends="freeradius perl"
+	depends="freeradius freeradius-lib perl"
 	mkdir -p $subpkgdir/usr/lib/freeradius
 	mv $pkgdir/usr/lib/freeradius/rlm_perl* $subpkgdir/usr/lib/freeradius
 	mkdir -p $subpkgdir/usr/bin
@@ -130,7 +137,7 @@ perl() {
 }
 
 postgresql() {
-	depends="freeradius"
+	depends="freeradius freeradius-lib"
 	mkdir -p $subpkgdir/etc/raddb/sql
 	mv $pkgdir/etc/raddb/sql/postgresql $subpkgdir/etc/raddb/sql
 	mkdir -p $subpkgdir/usr/lib/freeradius
@@ -138,13 +145,19 @@ postgresql() {
 }
 
 python() {
-	depends="freeradius python"
+	depends="freeradius freeradius-lib python"
 	mkdir -p $subpkgdir/usr/lib/freeradius
 	mv $pkgdir/usr/lib/freeradius/rlm_python* $subpkgdir/usr/lib/freeradius
 }
 
+radclient() {
+	depends="freeradius-lib"
+	mkdir -p $subpkgdir/usr/lib/freeradius $subpkgdir/usr/bin
+	mv $pkgdir/usr/bin/radclient $subpkgdir/usr/bin/radclient
+}
+
 unixodbc() {
-	depends="freeradius"
+	depends="freeradius freeradius-lib"
 	mkdir -p $subpkgdir/usr/lib/freeradius
 	mv $pkgdir/usr/lib/freeradius/rlm_sql_unixodbc* $subpkgdir/usr/lib/freeradius
 }