+net/freeradius3 and register conflict with net/freeradius, ok jca@

This commit is contained in:
sthen 2015-11-12 13:00:27 +00:00
parent c0c0d89ade
commit fa2618e515
7 changed files with 14 additions and 9 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.933 2015/11/07 09:23:55 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.934 2015/11/12 13:00:27 sthen Exp $
SUBDIR =
SUBDIR += GeoIP
@ -98,6 +98,7 @@
SUBDIR += fpdns
SUBDIR += fping
SUBDIR += freeradius
SUBDIR += freeradius3
SUBDIR += freetalk
SUBDIR += ftpcopy
SUBDIR += ftpsesame

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.65 2015/11/07 14:51:08 sthen Exp $
# $OpenBSD: Makefile,v 1.66 2015/11/12 13:00:27 sthen Exp $
SHARED_ONLY= Yes
SHARED_LIBS += freeradius-radius 4.2 # .0.0
@ -11,8 +11,7 @@ COMMENT-pgsql= freeradius pgsql rlm addon
COMMENT-ldap= freeradius ldap rlm addon
V= 2.2.9
REVISION-main= 1
REVISION-mysql= 0
REVISION= 2
DISTNAME= freeradius-server-$V
EXTRACT_SUFX= .tar.bz2

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-iodbc,v 1.4 2014/07/17 00:20:51 sthen Exp $
@comment $OpenBSD: PLIST-iodbc,v 1.5 2015/11/12 13:00:27 sthen Exp $
@conflict freeradius-iodbc-*
lib/freeradius/rlm_sql_iodbc.so
share/doc/freeradius/mssql
share/examples/freeradius/sql/mssql/

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-ldap,v 1.5 2014/07/17 00:20:51 sthen Exp $
@comment $OpenBSD: PLIST-ldap,v 1.6 2015/11/12 13:00:27 sthen Exp $
@conflict freeradius-ldap-*
@conflict freeradius-server-<2.1.8
lib/freeradius/rlm_ldap.so
share/doc/freeradius/examples/iplanet.ldif

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.30 2015/11/07 14:51:08 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.31 2015/11/12 13:00:27 sthen Exp $
@conflict freeradius-*
@conflict radiusd-cistron-*
@conflict radiusd-lucent-*
@pkgpath net/freeradius

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-mysql,v 1.8 2015/11/08 11:04:48 sthen Exp $
@comment $OpenBSD: PLIST-mysql,v 1.9 2015/11/12 13:00:27 sthen Exp $
@conflict freeradius-mysql-*
@conflict freeradius-server-<2.2.9p1
lib/freeradius/rlm_sql_mysql.so
@mode 640

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-pgsql,v 1.5 2014/07/17 00:20:51 sthen Exp $
@comment $OpenBSD: PLIST-pgsql,v 1.6 2015/11/12 13:00:27 sthen Exp $
@conflict freeradius-pgsql-*
@conflict freeradius-<2.1.8
lib/freeradius/rlm_sql_postgresql.so
share/doc/freeradius/examples/postgresql_update_radacct_group_trigger.sql