pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/freeradius - Make gdbm optional, but keep it as de...
details: https://anonhg.NetBSD.org/pkgsrc/rev/89ef76cafddc
branches: trunk
changeset: 498660:89ef76cafddc
user: tv <tv%pkgsrc.org@localhost>
date: Mon Aug 29 14:28:12 2005 +0000
description:
- Make gdbm optional, but keep it as default. (Partial dbm support using
a builtin Berkeley DB 1.8x can now be used with option "bdb -gdbm"; no
dbm support at all can be selected with "-gdbm".)
- Specify --with/--without exactly once per option.
- Merge postgresql support to a single option (pgsql), and correspondingly
use pgsql.buildlink3.mk to pick the builder's desired implementation.
This aligns freeradius with the rest of pkgsrc, wrt pgsql support.
diffstat:
net/freeradius/Makefile | 15 +++----------
net/freeradius/PLIST | 14 +------------
net/freeradius/PLIST.dbm | 7 ++++++
net/freeradius/PLIST.gdbm | 5 ++++
net/freeradius/options.mk | 48 +++++++++++++++++++++++++++-------------------
5 files changed, 45 insertions(+), 44 deletions(-)
diffs (191 lines):
diff -r 459e1cd2d1ad -r 89ef76cafddc net/freeradius/Makefile
--- a/net/freeradius/Makefile Mon Aug 29 13:37:42 2005 +0000
+++ b/net/freeradius/Makefile Mon Aug 29 14:28:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/08/14 18:01:54 adrianp Exp $
+# $NetBSD: Makefile,v 1.33 2005/08/29 14:28:12 tv Exp $
DISTNAME= freeradius-1.0.4
PKGREVISION= 1
@@ -39,14 +39,10 @@
CONFIGURE_ARGS+= --without-rlm_ippool
CONFIGURE_ARGS+= --without-rlm_smb
CONFIGURE_ARGS+= --without-rlm_krb5
-CONFIGURE_ARGS+= --without-rlm_ldap
CONFIGURE_ARGS+= --without-rlm_pam
CONFIGURE_ARGS+= --without-rlm_sql_iodbc
-CONFIGURE_ARGS+= --without-rlm_sql_mysql
-CONFIGURE_ARGS+= --without-rlm_sql_postgresql
CONFIGURE_ARGS+= --without-rlm_sql_oracle
CONFIGURE_ARGS+= --without-rlm_sql_unixodbc
-CONFIGURE_ARGS+= --without-snmp
SUBST_CLASSES= make
SUBST_STAGE.make= post-patch
@@ -88,7 +84,6 @@
.undef f
.include "../../security/openssl/buildlink3.mk"
-.include "../../databases/gdbm/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
@@ -117,11 +112,9 @@
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA_DIR} ${EGDIR}/certs
${INSTALL_DATA_DIR} ${EGDIR}/certs/demoCA
-
-. for f in ${EGFILES}
- ${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${EGDIR}/${f}
-. endfor
-
+.for f in ${EGFILES}
+ ${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${EGDIR}/${f}
+.endfor
@${MKDIR} ${PKG_SYSCONFDIR}/certs
@${MKDIR} ${PKG_SYSCONFDIR}/certs/demoCA
cd ${WRKSRC} && ${FIND} . -name .libs | ${XARGS} ${RM} -rf
diff -r 459e1cd2d1ad -r 89ef76cafddc net/freeradius/PLIST
--- a/net/freeradius/PLIST Mon Aug 29 13:37:42 2005 +0000
+++ b/net/freeradius/PLIST Mon Aug 29 14:28:12 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/08/14 18:01:54 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/08/29 14:28:12 tv Exp $
bin/radclient
bin/radeapclient
bin/radlast
@@ -6,8 +6,6 @@
bin/radtest
bin/radwho
bin/radzap
-bin/rlm_dbm_cat
-bin/rlm_dbm_parser
bin/smbencrypt
lib/libeap-${PKGVERSION}.la
lib/libeap-${PKGVERSION}.so
@@ -49,16 +47,6 @@
lib/rlm_checkval.a
lib/rlm_checkval.la
lib/rlm_checkval.so
-lib/rlm_counter-${PKGVERSION}.la
-lib/rlm_counter-${PKGVERSION}.so
-lib/rlm_counter.a
-lib/rlm_counter.la
-lib/rlm_counter.so
-lib/rlm_dbm-${PKGVERSION}.la
-lib/rlm_dbm-${PKGVERSION}.so
-lib/rlm_dbm.a
-lib/rlm_dbm.la
-lib/rlm_dbm.so
lib/rlm_detail-${PKGVERSION}.la
lib/rlm_detail-${PKGVERSION}.so
lib/rlm_detail.a
diff -r 459e1cd2d1ad -r 89ef76cafddc net/freeradius/PLIST.dbm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeradius/PLIST.dbm Mon Aug 29 14:28:12 2005 +0000
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST.dbm,v 1.1 2005/08/29 14:28:12 tv Exp $
+bin/rlm_dbm_cat
+bin/rlm_dbm_parser
+lib/rlm_dbm-${PKGVERSION}.so
+lib/rlm_dbm.a
+lib/rlm_dbm.la
+lib/rlm_dbm.so
diff -r 459e1cd2d1ad -r 89ef76cafddc net/freeradius/PLIST.gdbm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeradius/PLIST.gdbm Mon Aug 29 14:28:12 2005 +0000
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.gdbm,v 1.1 2005/08/29 14:28:12 tv Exp $
+lib/rlm_counter-${PKGVERSION}.so
+lib/rlm_counter.a
+lib/rlm_counter.la
+lib/rlm_counter.so
diff -r 459e1cd2d1ad -r 89ef76cafddc net/freeradius/options.mk
--- a/net/freeradius/options.mk Mon Aug 29 13:37:42 2005 +0000
+++ b/net/freeradius/options.mk Mon Aug 29 14:28:12 2005 +0000
@@ -1,43 +1,47 @@
-# $NetBSD: options.mk,v 1.4 2005/03/02 21:44:55 adrianp Exp $
+# $NetBSD: options.mk,v 1.5 2005/08/29 14:28:12 tv Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.freeradius
-PKG_SUPPORTED_OPTIONS= ldap postgresql73 postgresql74 mysql snmp
+PKG_SUPPORTED_OPTIONS= bdb gdbm ldap mysql pgsql snmp
+PKG_SUGGESTED_OPTIONS= gdbm
.include "../../mk/bsd.options.mk"
###
-### Can't support both versions of PostgreSQL
+### Use GDBM or Berkeley DB 1.x for storing user details
###
-.if !empty(PKG_OPTIONS:Mpostgresql73) && !empty(PKG_OPTIONS:Mpostgresql74)
-PKG_FAIL_REASON+= "PostgreSQL 7.3 and 7.4 cannot both be compiled in." \
- "Please change ${PKG_OPTIONS_VAR} to one or the other."
+.if !empty(PKG_OPTIONS:Mgdbm)
+. include "../../databases/gdbm/buildlink3.mk"
+CONFIGURE_ARGS+= --with-rlm_dbm
+PLIST_SRC+= ${PKGDIR}/PLIST.dbm ${PKGDIR}/PLIST.gdbm
+.elif !empty(PKG_OPTIONS:Mbdb) && exists(/usr/include/ndbm.h)
+BDB_ACCEPTED= db1
+. include "../../mk/bdb.buildlink3.mk"
+CONFIGURE_ARGS+= --with-rlm_dbm
+PLIST_SRC+= ${PKGDIR}/PLIST.dbm
+.else
+CONFIGURE_ARGS+= --without-rlm_dbm
.endif
###
### Use OpenLDAP for storing user details
###
.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap/buildlink3.mk"
CONFIGURE_ARGS+= --with-rlm_ldap
PLIST_SRC+= ${PKGDIR}/PLIST.ldap
+.else
+CONFIGURE_ARGS+= --without-rlm_ldap
.endif
###
-### Use PostgreSQL v7.3 for storing user details
+### Use PostgreSQL for storing user details
###
-.if !empty(PKG_OPTIONS:Mpostgresql73)
-. include "../../databases/postgresql73-lib/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mpgsql)
+. include "../../mk/pgsql.buildlink3.mk"
CONFIGURE_ARGS+= --with-rlm_sql_postgresql
PLIST_SRC+= ${PKGDIR}/PLIST.pgsql
-.endif
-
-###
-### Use PostgreSQL v7.4 for storing user details
-###
-.if !empty(PKG_OPTIONS:Mpostgresql74)
-. include "../../databases/postgresql74-lib/buildlink3.mk"
-CONFIGURE_ARGS+= --with-rlm_sql_postgresql
-PLIST_SRC+= ${PKGDIR}/PLIST.pgsql
+.else
+CONFIGURE_ARGS+= --without-rlm_sql_postgresql
.endif
###
@@ -47,6 +51,8 @@
. include "../../mk/mysql.buildlink3.mk"
CONFIGURE_ARGS+= --with-rlm_sql_mysql
PLIST_SRC+= ${PKGDIR}/PLIST.mysql
+.else
+CONFIGURE_ARGS+= --without-rlm_sql_mysql
.endif
###
@@ -60,6 +66,8 @@
###
###
.if !empty(PKG_OPTIONS:Msnmp)
-. include "../../net/net-snmp/buildlink3.mk"
+. include "../../net/net-snmp/buildlink3.mk"
CONFIGURE_ARGS+= --with-snmp
+.else
+CONFIGURE_ARGS+= --without-snmp
.endif
Home |
Main Index |
Thread Index |
Old Index