main/freeradius: remove conflicts, fix subpkgs depends

1 files changed, 14 insertions, 15 deletions

diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index bb2683003..d05a3214d 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -5,12 +5,12 @@
 pkgname=freeradius
 _realname=freeradius
 pkgver=3.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="http://freeradius.org/"
 arch="all"
 license="GPL"
-depends="freeradius3-lib"
+depends="freeradius-lib"
 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
@@ -30,7 +30,6 @@ source="ftp://ftp.freeradius.org/pub/freeradius/$_realname-server-$pkgver.tar.gz
 	disable-cert-generation.patch
 	freeradius-305-default-config.patch
 	"
-conflict="freeradius freeradius-lib freeradius-radclient"
 
 _builddir="$srcdir"/$_realname-server-$pkgver
 
@@ -122,7 +121,7 @@ _mvdb() {
 }
 
 eap() {
-	depends="freeradius3"
+	depends="freeradius"
 	pkgdesc="EAP module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_eap*.so "${subpkgdir}"${radlibdir} \
@@ -134,7 +133,7 @@ eap() {
 }
 
 ldap() {
-	depends="freeradius3"
+	depends="freeradius"
 	pkgdesc="LDAP module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_ldap* "${subpkgdir}"${radlibdir} \
@@ -142,7 +141,7 @@ ldap() {
 }
 
 krb5() {
-	depends="freeradius3"
+	depends="freeradius"
 	pkgdesc="Kerberos module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_krb5* "${subpkgdir}"${radlibdir} \
@@ -161,7 +160,7 @@ lib() {
 }
 
 sql() {
-	depends="freeradius3"
+	depends="freeradius"
 	pkgdesc="SQL module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	for lib in sql sqlippool sql_null sqlcounter; do
@@ -177,13 +176,13 @@ sql() {
 }
 
 mysql() {
-	depends="freeradius3-sql"
+	depends="freeradius-sql"
 	pkgdesc="MySQL module for FreeRADIUS server"
 	_mvdb mysql || return 1
 }
 
 mssql() {
-	depends="freeradius3-sql"
+	depends="freeradius-sql"
 	pkgdesc="MSSQL module for FreeRADIUS server"
 	arch="noarch"
 	mkdir -p "${subpkgdir}"${radmodsconfdir}/sql/main
@@ -192,7 +191,7 @@ mssql() {
 }
 
 perl() {
-	depends="freeradius3 perl"
+	depends="freeradius perl"
 	pkgdesc="Perl module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_perl* "${subpkgdir}"${radlibdir} \
@@ -206,13 +205,13 @@ perl() {
 }
 
 postgresql() {
-	depends="freeradius3-sql"
+	depends="freeradius-sql"
 	pkgdesc="PostgreSQL module for FreeRADIUS server"
 	_mvdb postgresql || return 1
 }
 
 python() {
-	depends="freeradius3 python"
+	depends="freeradius python"
 	pkgdesc="Python module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_python* "${subpkgdir}"${radlibdir} \
@@ -232,13 +231,13 @@ radclient() {
 }
 
 sqlite() {
-	depends="freeradius3-sql"
+	depends="freeradius-sql"
 	pkgdesc="SQLite module for FreeRADIUS server"
 	_mvdb sqlite || return 1
 }
 
 unixodbc() {
-	depends="freeradius3"
+	depends="freeradius"
 	pkgdesc="ODBC module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_sql_unixodbc.so \
@@ -246,7 +245,7 @@ unixodbc() {
 }
 
 pam() {
-	depends="freeradius3"
+	depends="freeradius"
 	pkgdesc="PAM module for FreeRADIUS server"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	mv "${pkgdir}"${radlibdir}/rlm_pam* "${subpkgdir}"${radlibdir} \