[Midnightbsd-cvs] mports: net/freeradius: Update to 1.1.7
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Feb 27 19:37:14 EST 2008
Log Message:
-----------
Update to 1.1.7
Modified Files:
--------------
mports/net/freeradius:
Makefile (r1.3 -> r1.4)
distinfo (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/net/freeradius/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net/freeradius/pkg-plist -L net/freeradius/pkg-plist -u -r1.1 -r1.2
--- net/freeradius/pkg-plist
+++ net/freeradius/pkg-plist
@@ -1,5 +1,3 @@
- at unexec %D/etc/rc.d/radiusd.sh forcestop 2>/dev/null || true
- at unexec %D/etc/rc.d/radiusd forcestop 2>/dev/null || true
bin/radclient
bin/radeapclient
bin/radlast
@@ -12,52 +10,64 @@
bin/rlm_dbm_parser
bin/rlm_ippool_tool
bin/smbencrypt
- at unexec for i in `find %D/etc/raddb -maxdepth 1 -regex '.*\.sample' -print | sed -e 's/\.sample//g'`; do if [ -f ${i} ]; then if cmp -s ${i}.sample ${i}; then rm -f ${i}; fi; fi; done
-etc/raddb/acct_users.sample
-etc/raddb/attrs.sample
-etc/raddb/certs/README
-etc/raddb/certs/cert-clt.der
-etc/raddb/certs/cert-clt.p12
-etc/raddb/certs/cert-clt.pem
-etc/raddb/certs/cert-srv.der
-etc/raddb/certs/cert-srv.p12
-etc/raddb/certs/cert-srv.pem
-etc/raddb/certs/demoCA/cacert.pem
-etc/raddb/certs/demoCA/index.txt
-etc/raddb/certs/demoCA/index.txt.old
-etc/raddb/certs/demoCA/serial
-etc/raddb/certs/demoCA/serial.old
-etc/raddb/certs/dh
-etc/raddb/certs/newcert.pem
-etc/raddb/certs/newreq.pem
-etc/raddb/certs/random
-etc/raddb/certs/root.der
-etc/raddb/certs/root.p12
-etc/raddb/certs/root.pem
-etc/raddb/clients.conf.sample
-etc/raddb/clients.sample
-etc/raddb/dictionary.sample
-etc/raddb/eap.conf.sample
-etc/raddb/example.pl
-etc/raddb/experimental.conf.sample
-etc/raddb/hints.sample
-etc/raddb/huntgroups.sample
-etc/raddb/ldap.attrmap.sample
-etc/raddb/mssql.conf.sample
-etc/raddb/naslist.sample
-etc/raddb/naspasswd.sample
-etc/raddb/oraclesql.conf.sample
-etc/raddb/otp.conf.sample
-etc/raddb/postgresql.conf.sample
-etc/raddb/preproxy_users.sample
-etc/raddb/proxy.conf.sample
-etc/raddb/radiusd.conf.sample
-etc/raddb/realms.sample
-etc/raddb/snmp.conf.sample
-etc/raddb/sql.conf.sample
-etc/raddb/sqlippool.conf.sample
-etc/raddb/users.sample
- at exec for i in `find %D/etc/raddb -maxdepth 1 -regex '.*\.sample' -print | sed -e 's/\.sample//g'`; do if [ ! -f ${i} ]; then cp -p ${i}.sample ${i}; fi; done
+ at unexec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type f -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ -f %D/%%EXAMPLESDIR%%/raddb/${i} ]; then if cmp -s %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; then rm -f %D/etc/raddb/${i}; fi; fi; done
+ at unexec for i in `find -d %D/%%EXAMPLESDIR%%/raddb/ -type d -mindepth 1 -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ -d %D/etc/raddb/${i} ]; then rmdir %D/etc/raddb/${i} 2>/dev/null || true; fi; done
+ at dirrmtry etc/raddb/certs/demoCA
+ at dirrmtry etc/raddb/certs
+ at dirrmtry etc/raddb
+ at unexec if [ -d %D/etc/raddb ]; then echo "You should remove %D/etc/raddb if you don't need it any more."; fi
+%%EXAMPLESDIR%%/raddb/acct_users
+%%EXAMPLESDIR%%/raddb/attrs
+%%EXAMPLESDIR%%/raddb/certs/README
+%%EXAMPLESDIR%%/raddb/certs/cert-clt.der
+%%EXAMPLESDIR%%/raddb/certs/cert-clt.p12
+%%EXAMPLESDIR%%/raddb/certs/cert-clt.pem
+%%EXAMPLESDIR%%/raddb/certs/cert-srv.der
+%%EXAMPLESDIR%%/raddb/certs/cert-srv.p12
+%%EXAMPLESDIR%%/raddb/certs/cert-srv.pem
+%%EXAMPLESDIR%%/raddb/certs/demoCA/cacert.pem
+%%EXAMPLESDIR%%/raddb/certs/demoCA/index.txt
+%%EXAMPLESDIR%%/raddb/certs/demoCA/index.txt.old
+%%EXAMPLESDIR%%/raddb/certs/demoCA/serial
+%%EXAMPLESDIR%%/raddb/certs/demoCA/serial.old
+%%EXAMPLESDIR%%/raddb/certs/dh
+%%EXAMPLESDIR%%/raddb/certs/newcert.pem
+%%EXAMPLESDIR%%/raddb/certs/newreq.pem
+%%EXAMPLESDIR%%/raddb/certs/random
+%%EXAMPLESDIR%%/raddb/certs/root.der
+%%EXAMPLESDIR%%/raddb/certs/root.p12
+%%EXAMPLESDIR%%/raddb/certs/root.pem
+%%EXAMPLESDIR%%/raddb/clients
+%%EXAMPLESDIR%%/raddb/clients.conf
+%%EXAMPLESDIR%%/raddb/dictionary
+%%EXAMPLESDIR%%/raddb/eap.conf
+%%EXAMPLESDIR%%/raddb/experimental.conf
+%%EXAMPLESDIR%%/raddb/hints
+%%EXAMPLESDIR%%/raddb/huntgroups
+%%EXAMPLESDIR%%/raddb/ldap.attrmap
+%%EXAMPLESDIR%%/raddb/mssql.conf
+%%EXAMPLESDIR%%/raddb/naslist
+%%EXAMPLESDIR%%/raddb/naspasswd
+%%EXAMPLESDIR%%/raddb/oraclesql.conf
+%%EXAMPLESDIR%%/raddb/otp.conf
+%%EXAMPLESDIR%%/raddb/postgresql.conf
+%%EXAMPLESDIR%%/raddb/postgresqlippool.conf
+%%EXAMPLESDIR%%/raddb/preproxy_users
+%%EXAMPLESDIR%%/raddb/proxy.conf
+%%EXAMPLESDIR%%/raddb/radiusd.conf
+%%EXAMPLESDIR%%/raddb/realms
+%%EXAMPLESDIR%%/raddb/snmp.conf
+%%EXAMPLESDIR%%/raddb/sql.conf
+%%EXAMPLESDIR%%/raddb/sqlippool.conf
+%%EXAMPLESDIR%%/raddb/users
+%%EXAMPLESDIR%%/raddb/example.pl
+ at exec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type d -mindepth 1 -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -d %D/etc/raddb/${i} ]; then mkdir -p %D/etc/raddb/${i}; fi; done
+ at exec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type f -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -f %D/etc/raddb/${i} ]; then cp %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; fi; done
+ at exec chmod -R g-w,o-rwx %D/etc/raddb
+ at dirrm %%EXAMPLESDIR%%/raddb/certs/demoCA
+ at dirrm %%EXAMPLESDIR%%/raddb/certs
+ at dirrm %%EXAMPLESDIR%%/raddb
+ at dirrm %%EXAMPLESDIR%%
lib/libeap-%%PORTVERSION%%.la
lib/libeap-%%PORTVERSION%%.so
lib/libeap.a
@@ -148,26 +158,26 @@
lib/rlm_eap_mschapv2.a
lib/rlm_eap_mschapv2.la
lib/rlm_eap_mschapv2.so
-%%4SSL%%lib/rlm_eap_peap-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_peap-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_peap.a
-%%4SSL%%lib/rlm_eap_peap.la
-%%4SSL%%lib/rlm_eap_peap.so
+lib/rlm_eap_peap-%%PORTVERSION%%.la
+lib/rlm_eap_peap-%%PORTVERSION%%.so
+lib/rlm_eap_peap.a
+lib/rlm_eap_peap.la
+lib/rlm_eap_peap.so
lib/rlm_eap_sim-%%PORTVERSION%%.la
lib/rlm_eap_sim-%%PORTVERSION%%.so
lib/rlm_eap_sim.a
lib/rlm_eap_sim.la
lib/rlm_eap_sim.so
-%%4SSL%%lib/rlm_eap_tls-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_tls-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_tls.a
-%%4SSL%%lib/rlm_eap_tls.la
-%%4SSL%%lib/rlm_eap_tls.so
-%%4SSL%%lib/rlm_eap_ttls-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_ttls-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_ttls.a
-%%4SSL%%lib/rlm_eap_ttls.la
-%%4SSL%%lib/rlm_eap_ttls.so
+lib/rlm_eap_tls-%%PORTVERSION%%.la
+lib/rlm_eap_tls-%%PORTVERSION%%.so
+lib/rlm_eap_tls.a
+lib/rlm_eap_tls.la
+lib/rlm_eap_tls.so
+lib/rlm_eap_ttls-%%PORTVERSION%%.la
+lib/rlm_eap_ttls-%%PORTVERSION%%.so
+lib/rlm_eap_ttls.a
+lib/rlm_eap_ttls.la
+lib/rlm_eap_ttls.so
%%EXPM%%lib/rlm_example-%%PORTVERSION%%.la
%%EXPM%%lib/rlm_example-%%PORTVERSION%%.so
%%EXPM%%lib/rlm_example.a
@@ -218,11 +228,11 @@
lib/rlm_ns_mta_md5.a
lib/rlm_ns_mta_md5.la
lib/rlm_ns_mta_md5.so
-%%4SSL%%lib/rlm_otp-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_otp-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_otp.a
-%%4SSL%%lib/rlm_otp.la
-%%4SSL%%lib/rlm_otp.so
+lib/rlm_otp-%%PORTVERSION%%.la
+lib/rlm_otp-%%PORTVERSION%%.so
+lib/rlm_otp.a
+lib/rlm_otp.la
+lib/rlm_otp.so
lib/rlm_pam-%%PORTVERSION%%.la
lib/rlm_pam-%%PORTVERSION%%.so
lib/rlm_pam.a
@@ -278,6 +288,10 @@
lib/rlm_sql.a
lib/rlm_sql.la
lib/rlm_sql.so
+%%FIREBIRD%%lib/rlm_sql_firebird-%%PORTVERSION%%.so
+%%FIREBIRD%%lib/rlm_sql_firebird.a
+%%FIREBIRD%%lib/rlm_sql_firebird.la
+%%FIREBIRD%%lib/rlm_sql_firebird.so
lib/rlm_sql_log-%%PORTVERSION%%.la
lib/rlm_sql_log-%%PORTVERSION%%.so
lib/rlm_sql_log.a
@@ -296,6 +310,16 @@
lib/rlm_sqlcounter.a
lib/rlm_sqlcounter.la
lib/rlm_sqlcounter.so
+%%EXPM%%lib/rlm_sqlhpwippool-%%PORTVERSION%%.la
+%%EXPM%%lib/rlm_sqlhpwippool-%%PORTVERSION%%.so
+%%EXPM%%lib/rlm_sqlhpwippool.a
+%%EXPM%%lib/rlm_sqlhpwippool.la
+%%EXPM%%lib/rlm_sqlhpwippool.so
+lib/rlm_sqlippool-%%PORTVERSION%%.la
+lib/rlm_sqlippool-%%PORTVERSION%%.so
+lib/rlm_sqlippool.a
+lib/rlm_sqlippool.la
+lib/rlm_sqlippool.so
lib/rlm_unix-%%PORTVERSION%%.la
lib/rlm_unix-%%PORTVERSION%%.so
lib/rlm_unix.a
@@ -334,6 +358,7 @@
%%PORTDOCS%%%%DOCSDIR%%/examples/openldap.schema
%%PORTDOCS%%%%DOCSDIR%%/examples/oracle.sql
%%PORTDOCS%%%%DOCSDIR%%/examples/postgresql.sql
+%%PORTDOCS%%%%DOCSDIR%%/examples/postgresql.sql.extra
%%PORTDOCS%%%%DOCSDIR%%/ldap_howto.txt
%%PORTDOCS%%%%DOCSDIR%%/load-balance.txt
%%PORTDOCS%%%%DOCSDIR%%/misc-nas
@@ -398,6 +423,9 @@
%%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt
%%PORTDOCS%%%%DOCSDIR%%/tuning_guide
%%PORTDOCS%%%%DOCSDIR%%/variables.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%DATADIR%%/dictionary
%%DATADIR%%/dictionary.3com
%%DATADIR%%/dictionary.3gpp
@@ -411,6 +439,7 @@
%%DATADIR%%/dictionary.aptis
%%DATADIR%%/dictionary.aruba
%%DATADIR%%/dictionary.ascend
+%%DATADIR%%/dictionary.asn
%%DATADIR%%/dictionary.avaya
%%DATADIR%%/dictionary.bay
%%DATADIR%%/dictionary.bintec
@@ -470,7 +499,10 @@
%%DATADIR%%/dictionary.rfc3162
%%DATADIR%%/dictionary.rfc3576
%%DATADIR%%/dictionary.rfc3580
+%%DATADIR%%/dictionary.rfc4372
%%DATADIR%%/dictionary.rfc4590
+%%DATADIR%%/dictionary.rfc4675
+%%DATADIR%%/dictionary.rfc4679
%%DATADIR%%/dictionary.riverstone
%%DATADIR%%/dictionary.roaringpenguin
%%DATADIR%%/dictionary.schulzrinne-sipping
@@ -495,14 +527,7 @@
%%DATADIR%%/dictionary.xylan
%%DATADIR%%/dictionary.zyxel
@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm etc/raddb/certs/demoCA
- at dirrm etc/raddb/certs
@exec mkdir -p /var/log/raddb
@exec chmod -R og= /var/log/raddb
@exec mkdir -p /var/run/radiusd
@unexec rm -fr /var/run/radiusd
- at dirrmtry etc/raddb
- at unexec if [ -d %D/etc/raddb ]; then echo "You should remove %D/etc/raddb if you don't need it anymore."; fi
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/freeradius/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L net/freeradius/Makefile -L net/freeradius/Makefile -u -r1.3 -r1.4
--- net/freeradius/Makefile
+++ net/freeradius/Makefile
@@ -3,31 +3,43 @@
# Whom: Brian Somers <brian at FreeBSD.org>
#
# $MidnightBSD$
-# $FreeBSD: ports/net/freeradius/Makefile,v 1.54 2007/01/23 12:35:52 sem Exp $
+# $FreeBSD: ports/net/freeradius/Makefile,v 1.65 2008/01/31 13:29:09 jmelo Exp $
#
PORTNAME= freeradius
-PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTVERSION= 1.1.7
CATEGORIES= net
-MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
- ftp://ftp.ntua.gr/pub/net/radius/freeradius/ \
- ftp://ftp.uk.freeradius.org/pub/radius/ \
- ftp://ftp.us.freeradius.org/pub/radius/ \
- ftp://ftp.freeradius.org/pub/radius/old/ \
- http://freeradius.portal-to-web.de/
+MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
+ ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
+ ftp://ftp.uk.freeradius.org/pub/radius/%SUBDIR%/ \
+ http://ftp.cc.uoc.gr/mirrors/ftp.freeradius.org/%SUBDIR%/ \
+ http://freeradius.portal-to-web.de/%SUBDIR%/
+MASTER_SITE_SUBDIR= . old
MAINTAINER= ports at MidnightBSD.org
COMMENT= A free RADIUS server implementation
+LICENSE= gpl2
+
+USE_BZIP2= yes
+WANT_PERL= yes
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
LOGDIR?= /var/log
-CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
+# If FREERADIUS_SLAVE_MYSQL is defined, we want to build the
+# freeradius-mysql slave port
+
+CONFLICTS= gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].*
+.ifdef(FREERADIUS_SLAVE_MYSQL)
+CONFLICTS+= freeradius-[0-9].* freeradius-mysql-[02-9].*
+PKGNAMESUFFIX= -mysql
+.else
+CONFLICTS+= freeradius-mysql-[0-9].* freeradius-[02-9].*
+.endif
USE_RC_SUBR= radiusd.sh
-USE_AUTOTOOLS= libltdl:15 libtool:15
+USE_AUTOTOOLS= libltdl:15 libtool:15 autoconf:261
USE_GMAKE= yes
USE_OPENSSL= yes
DESTDIRNAME= R
@@ -38,9 +50,11 @@
OPTIONS= KERBEROS "With Kerberos support" off \
HEIMDAL "With Heimdal Kerberos support" off \
- LDAP "With LDAP user database" off \
- MYSQL "With MySQL user database" off \
- PGSQL "With PostgreSQL use database" off \
+ LDAP "With LDAP database support" off
+.ifndef(FREERADIUS_SLAVE_MYSQL)
+OPTIONS+= MYSQL "With MySQL database support" off
+.endif
+OPTIONS+= PGSQL "With PostgreSQL database support" off \
SNMP "With SNMP support" off \
EDIR "With Novell eDirectory support" off \
NOPERL "Do not require perl (use only if necessary)" off \
@@ -48,22 +62,39 @@
.include <bsd.port.pre.mk>
+# Default requirements for rc script
+_REQUIRE= NETWORKING SERVERS
+
+.ifdef(FREERADIUS_SLAVE_MYSQL)
+WITH_MYSQL= yes
+.endif
+
+FAKE_OPTS= prefixhack
CONFIGURE_ARGS= --quiet \
--prefix=${PREFIX} \
--localstatedir=/var \
- --mandir=${PREFIX}/man \
- --with-system-libtool \
- --with-docdir=${DOCSDIR} \
- --with-logdir=${LOGDIR} \
+ --with-system-libtool
+.ifdef(NOPORTDOCS)
+CONFIGURE_ARGS+=--without-docdir
+PLIST_SUB+= PORTDOCS="@comment "
+.else
+CONFIGURE_ARGS+=--with-docdir=${DOCSDIR}
+PLIST_SUB+= PORTDOCS=""
+.endif
+CONFIGURE_ARGS+=--with-logdir=${LOGDIR} \
--with-large-files \
- --with-openssl-includes=${OPENSSLINC} \
- --with-openssl-libraries=${OPENSSLLIB} \
- --without-rlm_sql_unixodbc \
- --without-rlm_sql_oracle \
+ --with-openssl-includes=${OPENSSLINC}
+# This conditionality avoids -L/usr/lib in the radiusd build step when
+# building with base system OpenSSL
+.if ${OPENSSLLIB} != "/usr/lib"
+CONFIGURE_ARGS+=--with-openssl-libraries=${OPENSSLLIB}
+.endif
+CONFIGURE_ARGS+=--without-rlm_sql_db2 \
+ --without-rlm_sql_freetds \
--without-rlm_sql_iodbc \
- --without-rlm_sql_db2
-
-PLIST_SUB+= 4SSL=""
+ --without-rlm_sql_oracle \
+ --without-rlm_sql_sybase \
+ --without-rlm_sql_unixodbc
.if ${ARCH} == amd64
CONFIGURE_ARGS+= --with-pic
@@ -75,7 +106,7 @@
.ifdef(WITH_KERBEROS)
.ifdef(WITH_HEIMDAL)
-LIB_DEPENDS+= krb5.21:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=--enable-heimdal-krb5
.else
LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5
@@ -95,6 +126,7 @@
.ifdef(WITH_LDAP)
USE_OPENLDAP= YES
PLIST_SUB+= LDAP=""
+_REQUIRE+= slapd
.else
CONFIGURE_ARGS+=--without-rlm_ldap
PLIST_SUB+= LDAP="@comment "
@@ -106,7 +138,9 @@
.ifdef(WITH_MYSQL)
USE_MYSQL= YES
+CONFIGURE_ARGS+=--with-rlm_sql_mysql
PLIST_SUB+= MYSQL=""
+_REQUIRE+= mysql
.else
CONFIGURE_ARGS+=--without-rlm_sql_mysql
PLIST_SUB+= MYSQL="@comment "
@@ -114,12 +148,17 @@
.ifdef(WITH_PGSQL)
USE_PGSQL= YES
+CONFIGURE_ARGS+=--with-rlm_sql_postgresql
PLIST_SUB+= PGSQL=""
+_REQUIRE+= postgresql
.else
CONFIGURE_ARGS+=--without-rlm_sql_postgresql
PLIST_SUB+= PGSQL="@comment "
.endif
+CONFIGURE_ARGS+=--without-rlm_sql_firebird
+PLIST_SUB+= FIREBIRD="@comment "
+
.ifdef(WITH_SNMP)
LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
.else
@@ -136,23 +175,19 @@
PLIST_SUB+= EXPM="@comment "
.endif
-.ifndef(WITH_NOPERL)
-USE_PERL5= yes
+.ifdef(WITH_DEVELOPER)
+CONFIGURE_ARGS+=--enable-developer
.endif
-# rlm_perl does not build on 4.x
-.if defined(WITH_NOPERL)
+.ifdef(WITH_NOPERL)
CONFIGURE_ARGS+=--without-rlm_perl
PLIST_SUB+= RLMPERL="@comment "
.else
+USE_PERL5= yes
CONFIGURE_ARGS+=--with-rlm_perl
PLIST_SUB+= RLMPERL=""
.endif
-.if defined(NOPORTDOCS)
-MAKE_ENV+= NOPORTDOCS=yes
-.endif
-
USE_LDCONFIG= yes
MAN1= radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \
@@ -161,57 +196,52 @@
radiusd.conf.5 rlm_acct_unique.5 rlm_always.5 \
rlm_attr_filter.5 rlm_attr_rewrite.5 rlm_chap.5 rlm_counter.5 \
rlm_detail.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 rlm_pap.5 \
- rlm_passwd.5 rlm_realm.5 rlm_sql.5 rlm_sql_log.5 rlm_unix.5 users.5
+ rlm_passwd.5 rlm_realm.5 rlm_sql.5 rlm_sql_log.5 rlm_unix.5 \
+ users.5
MAN8= radiusd.8 radrelay.8 radsqlrelay.8 radwatch.8 rlm_ippool_tool.8
-DICTS= dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
- dictionary.airespace dictionary.alcatel dictionary.alteon \
- dictionary.altiga dictionary.alvarion dictionary.aptis \
- dictionary.aruba dictionary.ascend dictionary.avaya \
- dictionary.bay dictionary.bintec dictionary.bristol \
- dictionary.cablelabs dictionary.cabletron dictionary.cisco \
- dictionary.cisco.bbsm dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \
- dictionary.colubris dictionary.columbia_university dictionary.compat \
- dictionary.cosine dictionary.digium dictionary.epygi \
- dictionary.ericsson dictionary.erx dictionary.extreme \
- dictionary.fortinet dictionary.foundry dictionary.freeradius \
- dictionary.freeradius.internal dictionary.gandalf dictionary.garderos \
- dictionary.gemtek dictionary.hp dictionary.ipunplugged dictionary.issanni \
- dictionary.itk dictionary.juniper dictionary.karlnet \
- dictionary.livingston dictionary.localweb dictionary.lucent \
- dictionary.merit dictionary.microsoft dictionary.mikrotik \
- dictionary.motorola dictionary.navini dictionary.netscreen \
- dictionary.nokia dictionary.nomadix dictionary.nortel dictionary.ntua \
- dictionary.packeteer dictionary.patton \
- dictionary.propel dictionary.quintum \
- dictionary.redback dictionary.redcreek \
- dictionary.rfc2865 dictionary.rfc2866 dictionary.rfc2867 \
- dictionary.rfc2868 dictionary.rfc2869 dictionary.rfc3162 \
- dictionary.rfc3576 dictionary.rfc3580 dictionary.rfc4590 \
- dictionary.riverstone dictionary.roaringpenguin \
- dictionary.schulzrinne-sipping dictionary.shasta dictionary.shiva \
- dictionary.sofaware dictionary.sonicwall \
- dictionary.springtide dictionary.starent dictionary.t_systems_nova \
- dictionary.telebit dictionary.trapeze dictionary.tropos \
- dictionary.unix dictionary.usr dictionary.valemount \
- dictionary.versanet dictionary.walabi dictionary.waverider \
- dictionary.wispr dictionary.xedia dictionary.xylan dictionary.zyxel
+SUB_LIST+= REQUIRE="${_REQUIRE}"
post-patch:
- @${RM} ${WRKSRC}/doc/Makefile.orig
-# rlm_sql_firebird in 1.1.4 makes configure fail with experimental modules enabled,
-# even though the port implicitly issues --without-rlm_sql_firebird. Delete the module
-# until it is fixed
- @${RM} -r ${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_firebird
+# Patch Makefile / Makefile.in throughout the source tree to install raddb
+# contents in ${EXAMPLESDIR}/raddb rather than the raddbdir from configure
+ @${FIND} -E ${WRKSRC} -regex '.*/Makefile(\.in)?$$' -exec \
+ ${REINPLACE_CMD} -e "s:\$$(R)\$$(raddbdir):${FAKE_DESTDIR}${EXAMPLESDIR}/raddb:g" {} \;
+# Clean up after the last operation (so as not to get unwanted files when installing doc/)
+ @${FIND} -E ${WRKSRC} -regex '.*/Makefile(\.in)?\.(orig|bak)$$' -delete
+
+pre-configure:
+# Replace -pthread with ${PTHREAD_LIBS} in configure(.in) files
+ @${FIND} -E ${WRKSRC} -regex '.*/configure(\.in)?$$' -exec \
+ ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" {} \;
+# Force the rebuild of some configures from configure.in, as we're patching
+# the configure.in
+# NOTE: ${WRKSRC}/configure is rebuilt automatically once autoconf:261 is
+# added to USE_AUTOTOOLS
+ @cd ${WRKSRC}/src/modules/rlm_ldap && ${AUTOCONF} -I ${WRKSRC}
+ @cd ${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_mysql \
+ && ${AUTOCONF} -I ${WRKSRC}
+ @cd ${WRKSRC}/src/modules/rlm_python && ${AUTOCONF} -I ${WRKSRC}
post-install:
- @${MKDIR} ${PREFIX}/etc/raddb ${DATADIR}
-.for dict in ${DICTS}
- ${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict}
-.endfor
- for i in `${FIND} ${PREFIX}/etc/raddb -maxdepth 1 -regex '.*\.sample' -print \
- | ${SED} -e 's/\.sample//g'`; do \
- if [ ! -f $${i} ]; then ${CP} -p $${i}.sample $${i}; fi; \
+# Create (if necessary) ${PREFIX}/etc/raddb and subdirectories using
+# ${EXAMPLESDIR}/raddb as the model layout
+ @for i in `${FIND} ${EXAMPLESDIR}/raddb/ -type d -print \
+ | ${SED} -e 's:^${EXAMPLESDIR}/raddb::g'`; do \
+ if [ ! -d ${PREFIX}/etc/raddb$${i} ]; then \
+ ${MKDIR} ${PREFIX}/etc/raddb$${i}; \
+ fi; \
+ done
+# Copy all files from ${EXAMPLESDIR}/raddb to ${PREFIX}/etc/raddb if they
+# don't already exist in the destination location
+ @for i in `${FIND} ${EXAMPLESDIR}/raddb/ -type f -print \
+ | ${SED} -e 's:^${EXAMPLESDIR}/raddb/::g'`; do \
+ if [ ! -f ${PREFIX}/etc/raddb/$${i} ]; then \
+ ${CP} ${EXAMPLESDIR}/raddb/$${i} ${PREFIX}/etc/raddb/$${i}; \
+ fi; \
done
+# Set ${PREFIX}/etc/raddb and all the files and folders in it to g-w,o-rwx
+# (FreeRADIUS will probably complain if this is not done)
+ @${CHMOD} -R g-w,o-rwx ${PREFIX}/etc/raddb
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net/freeradius/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net/freeradius/distinfo -L net/freeradius/distinfo -u -r1.1 -r1.2
--- net/freeradius/distinfo
+++ net/freeradius/distinfo
@@ -1,3 +1,3 @@
-MD5 (freeradius-1.1.4.tar.gz) = 0027d4cf8882bbafee30755a16632c6a
-SHA256 (freeradius-1.1.4.tar.gz) = 017fe27b59c8d16c61739cd8aec123150365f2885dfdf04d289bf3039f26f7e3
-SIZE (freeradius-1.1.4.tar.gz) = 3088835
+MD5 (freeradius-1.1.7.tar.bz2) = d95d303adccdaa065e4bb1d5038b2452
+SHA256 (freeradius-1.1.7.tar.bz2) = 4fa180d5afa4ae957efbad541be8408fc4f6837933793d4b30910802a1ea2cf0
+SIZE (freeradius-1.1.7.tar.bz2) = 2063278
More information about the Midnightbsd-cvs
mailing list