main/freeradius: make dependencies cleaner

- versioned depends in subpackages
- let abuild figure out the so depends

1 files changed, 14 insertions, 13 deletions

diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 7031b60b4f..e1d85ef8c2 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -5,12 +5,12 @@
 pkgname=freeradius
 _realname=freeradius
 pkgver=3.0.8
-pkgrel=3
+pkgrel=4
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="http://freeradius.org/"
 arch="all"
 license="GPL"
-depends="freeradius-lib"
+depends=""
 makedepends="openssl-dev mariadb-dev postgresql-dev gdbm-dev readline-dev
 	bash libtool autoconf automake perl-dev python-dev openldap-dev krb5-dev
 	unixodbc-dev linux-pam-dev sqlite-dev talloc-dev libpcap-dev
@@ -38,6 +38,7 @@ radconfdir="/etc/raddb"
 radmodsdir="$radconfdir/mods-available"
 radlibdir="/usr/lib/freeradius"
 radmodsconfdir="$radconfdir/mods-config"
+ldpath="$radlibdir"
 
 prepare() {
 	cd "$_builddir"
@@ -122,7 +123,7 @@ _mvdb() {
 }
 
 eap() {
-	depends="freeradius"
+	depends="freeradius=$pkgver-r$pkgrel"
 	pkgdesc="EAP module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_eap*.so "${subpkgdir}"${radlibdir} \
@@ -134,7 +135,7 @@ eap() {
 }
 
 ldap() {
-	depends="freeradius"
+	depends="freeradius=$pkgver-r$pkgrel"
 	pkgdesc="LDAP module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_ldap* "${subpkgdir}"${radlibdir} \
@@ -142,7 +143,7 @@ ldap() {
 }
 
 krb5() {
-	depends="freeradius"
+	depends="freeradius=$pkgver-r$pkgrel"
 	pkgdesc="Kerberos module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_krb5* "${subpkgdir}"${radlibdir} \
@@ -161,7 +162,7 @@ lib() {
 }
 
 sql() {
-	depends="freeradius"
+	depends="freeradius=$pkgver-r$pkgrel"
 	pkgdesc="SQL module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	for lib in sql sqlippool sql_null sqlcounter; do
@@ -177,13 +178,13 @@ sql() {
 }
 
 mysql() {
-	depends="freeradius-sql"
+	depends="freeradius-sql=$pkgver-r$pkgrel"
 	pkgdesc="MySQL module for FreeRADIUS server"
 	_mvdb mysql || return 1
 }
 
 mssql() {
-	depends="freeradius-sql"
+	depends="freeradius-sql=$pkgver-r$pkgrel"
 	pkgdesc="MSSQL module for FreeRADIUS server"
 	arch="noarch"
 	mkdir -p "${subpkgdir}"${radmodsconfdir}/sql/main
@@ -192,7 +193,7 @@ mssql() {
 }
 
 perl() {
-	depends="freeradius perl"
+	depends="freeradius=$pkgver-r$pkgrel perl"
 	pkgdesc="Perl module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_perl* "${subpkgdir}"${radlibdir} \
@@ -206,13 +207,13 @@ perl() {
 }
 
 postgresql() {
-	depends="freeradius-sql"
+	depends="freeradius-sql=$pkgver-r$pkgrel"
 	pkgdesc="PostgreSQL module for FreeRADIUS server"
 	_mvdb postgresql || return 1
 }
 
 python() {
-	depends="freeradius python"
+	depends="freeradius=$pkgver-r$pkgrel python"
 	pkgdesc="Python module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_python* "${subpkgdir}"${radlibdir} \
@@ -238,7 +239,7 @@ sqlite() {
 }
 
 unixodbc() {
-	depends="freeradius"
+	depends="freeradius=$pkgver-r$pkgrel"
 	pkgdesc="ODBC module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_sql_unixodbc.so \
@@ -246,7 +247,7 @@ unixodbc() {
 }
 
 pam() {
-	depends="freeradius"
+	depends="freeradius=$pkgver-r$pkgrel"
 	pkgdesc="PAM module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_pam* "${subpkgdir}"${radlibdir} \