summaryrefslogtreecommitdiff
path: root/net/freeradius
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-07-30 14:50:07 +0000
committerjmmv <jmmv@pkgsrc.org>2003-07-30 14:50:07 +0000
commit6a4cd0d9be9eab1949ef40495a4cc268a8542256 (patch)
treeffdf70829956901631622ad6e2d2aa4d56dbe32b /net/freeradius
parentd0cd7cfd0598f5ed74ac4727a9bd54446a4eebe9 (diff)
downloadpkgsrc-6a4cd0d9be9eab1949ef40495a4cc268a8542256.tar.gz
Convert to the bsd.pkg.install.mk framework:
- Install all configuration files under the examples directory. - Copy configuration files to PKG_SYSCONFDIR using CONF_FILES. - Honour PKG_SYSCONFDIR. - Use OWN_DIRS to handle the /var/run/radiusd status directory. - Use RCD_SCRIPTS to handle the rc.d script automatically. As a result, bump PKGREVISION to 3.
Diffstat (limited to 'net/freeradius')
-rw-r--r--net/freeradius/HEADER12
-rw-r--r--net/freeradius/Makefile36
-rw-r--r--net/freeradius/PLIST126
-rw-r--r--net/freeradius/distinfo3
-rwxr-xr-xnet/freeradius/files/radiusd19
-rw-r--r--net/freeradius/files/radiusd.sh27
-rw-r--r--net/freeradius/patches/patch-ae21
7 files changed, 124 insertions, 120 deletions
diff --git a/net/freeradius/HEADER b/net/freeradius/HEADER
new file mode 100644
index 00000000000..1385a103769
--- /dev/null
+++ b/net/freeradius/HEADER
@@ -0,0 +1,12 @@
+# $NetBSD: HEADER,v 1.1 2003/07/30 14:50:07 jmmv Exp $
+
+EGDIR="${PKG_PREFIX}/share/examples/freeradius"
+
+case ${STAGE} in
+POST-INSTALL|DEINSTALL)
+ for fp in ${EGDIR}/*; do
+ f="`${BASENAME} $fp`"
+ CONF_FILES="${CONF_FILES} ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f"
+ done
+ ;;
+esac
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 5eb4ae8898a..16c19a4ea09 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/30 12:08:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/30 14:50:08 jmmv Exp $
DISTNAME= freeradius-0.7
CATEGORIES= net
-PKGREVISION= 2
+PKGREVISION= 3
MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
ftp://ftp.Awfulhak.org/pub/radius/
@@ -15,6 +15,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
+USE_PKGINSTALL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CONFIGURE_ARGS= --quiet
@@ -22,6 +23,16 @@ CONFIGURE_ARGS+= --with-logdir=/var/log
CONFIGURE_ARGS+= --disable-ltdl-install
CONFIGURE_ARGS+= --with-ltdl-lib=${PREFIX}/lib
CONFIGURE_ARGS+= --with-ltdl-include=${PREFIX}/include
+CONFIGURE_ARGS+= --localstatedir=/var
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+
+RCD_SCRIPTS= radiusd
+
+OWN_DIRS= /var/run/radiusd
+
+PKG_SYSCONFSUBDIR= raddb
+EGDIR= ${PREFIX}/share/examples/freeradius
+CONF_FILES= # Contents set in HEADER file
.include "../../mk/bsd.prefs.mk"
@@ -32,24 +43,11 @@ CONFIGURE_ARGS+= --with-threads=no
. endif
.endif
-RADDB= acct_users attrs clients clients.conf dictionary \
- dictionary.acc dictionary.aptis dictionary.ascend \
- dictionary.bay dictionary.cisco dictionary.compat \
- dictionary.erx dictionary.foundry dictionary.freeradius \
- dictionary.livingston dictionary.microsoft dictionary.nomadix \
- dictionary.quintum dictionary.redback dictionary.shasta \
- dictionary.shiva dictionary.tunnel dictionary.usr \
- dictionary.versanet hints huntgroups ldap.attrmap naslist \
- naspasswd postgresql.conf proxy.conf radiusd.conf realms \
- snmp.conf sql.conf users x99.conf
-
post-install:
- @${INSTALL_DATA_DIR} ${PREFIX}/etc/raddb
-.for db in ${RADDB}
- ${INSTALL_DATA} ${WRKSRC}/raddb/${db} ${PREFIX}/etc/raddb/${db}.sample
-.endfor
- @${SED} -e "s=!!PREFIX!!=${PREFIX}=g" ${FILESDIR}/radiusd \
- > ${PREFIX}/etc/rc.d/radiusd
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ cd ${WRKSRC}/raddb && for f in [a-z]*; do \
+ ${INSTALL_DATA} $$f ${EGDIR}/$$f; \
+ done
.include "../../databases/gdbm/buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST
index 9464381f237..e67527a884c 100644
--- a/net/freeradius/PLIST
+++ b/net/freeradius/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/12 05:56:49 jmc Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/07/30 14:50:08 jmmv Exp $
bin/radclient
bin/radlast
bin/radrelay
@@ -9,85 +9,6 @@ bin/radzap
bin/rlm_dbm_cat
bin/rlm_dbm_parser
bin/smbencrypt
-etc/raddb/acct_users
-etc/raddb/acct_users.sample
-etc/raddb/attrs
-etc/raddb/attrs.sample
-etc/raddb/clients
-etc/raddb/clients.conf
-etc/raddb/clients.conf.sample
-etc/raddb/clients.sample
-etc/raddb/dictionary
-etc/raddb/dictionary.acc
-etc/raddb/dictionary.acc.sample
-etc/raddb/dictionary.alcatel
-etc/raddb/dictionary.aptis
-etc/raddb/dictionary.aptis.sample
-etc/raddb/dictionary.ascend
-etc/raddb/dictionary.ascend.sample
-etc/raddb/dictionary.bay
-etc/raddb/dictionary.bay.sample
-etc/raddb/dictionary.cisco
-etc/raddb/dictionary.cisco.sample
-etc/raddb/dictionary.columbia_university
-etc/raddb/dictionary.compat
-etc/raddb/dictionary.compat.sample
-etc/raddb/dictionary.erx
-etc/raddb/dictionary.erx.sample
-etc/raddb/dictionary.foundry
-etc/raddb/dictionary.foundry.sample
-etc/raddb/dictionary.freeradius
-etc/raddb/dictionary.freeradius.sample
-etc/raddb/dictionary.livingston
-etc/raddb/dictionary.livingston.sample
-etc/raddb/dictionary.microsoft
-etc/raddb/dictionary.microsoft.sample
-etc/raddb/dictionary.nomadix
-etc/raddb/dictionary.nomadix.sample
-etc/raddb/dictionary.quintum
-etc/raddb/dictionary.quintum.sample
-etc/raddb/dictionary.redback
-etc/raddb/dictionary.redback.sample
-etc/raddb/dictionary.sample
-etc/raddb/dictionary.shasta
-etc/raddb/dictionary.shasta.sample
-etc/raddb/dictionary.shiva
-etc/raddb/dictionary.shiva.sample
-etc/raddb/dictionary.tunnel
-etc/raddb/dictionary.tunnel.sample
-etc/raddb/dictionary.usr
-etc/raddb/dictionary.usr.sample
-etc/raddb/dictionary.versanet
-etc/raddb/dictionary.versanet.sample
-etc/raddb/experimental.conf
-etc/raddb/hints
-etc/raddb/hints.sample
-etc/raddb/huntgroups
-etc/raddb/huntgroups.sample
-etc/raddb/ldap.attrmap
-etc/raddb/ldap.attrmap.sample
-etc/raddb/mssql.conf
-etc/raddb/naslist
-etc/raddb/naslist.sample
-etc/raddb/naspasswd
-etc/raddb/naspasswd.sample
-etc/raddb/postgresql.conf
-etc/raddb/postgresql.conf.sample
-etc/raddb/proxy.conf
-etc/raddb/proxy.conf.sample
-etc/raddb/radiusd.conf
-etc/raddb/radiusd.conf.sample
-etc/raddb/realms
-etc/raddb/realms.sample
-etc/raddb/snmp.conf
-etc/raddb/snmp.conf.sample
-etc/raddb/sql.conf
-etc/raddb/sql.conf.sample
-etc/raddb/users
-etc/raddb/users.sample
-etc/raddb/x99.conf
-etc/raddb/x99.conf.sample
-etc/raddb/x99passwd.sample
etc/rc.d/radiusd
lib/libradius-${PKGVERSION}.la
lib/libradius-${PKGVERSION}.so
@@ -223,4 +144,47 @@ sbin/checkrad
sbin/radiusd
sbin/radwatch
sbin/rc.radiusd
-@dirrm etc/raddb
+share/examples/freeradius/acct_users
+share/examples/freeradius/attrs
+share/examples/freeradius/clients
+share/examples/freeradius/clients.conf
+share/examples/freeradius/dictionary
+share/examples/freeradius/dictionary.acc
+share/examples/freeradius/dictionary.alcatel
+share/examples/freeradius/dictionary.aptis
+share/examples/freeradius/dictionary.ascend
+share/examples/freeradius/dictionary.bay
+share/examples/freeradius/dictionary.cisco
+share/examples/freeradius/dictionary.columbia_university
+share/examples/freeradius/dictionary.compat
+share/examples/freeradius/dictionary.erx
+share/examples/freeradius/dictionary.foundry
+share/examples/freeradius/dictionary.freeradius
+share/examples/freeradius/dictionary.livingston
+share/examples/freeradius/dictionary.microsoft
+share/examples/freeradius/dictionary.nomadix
+share/examples/freeradius/dictionary.quintum
+share/examples/freeradius/dictionary.redback
+share/examples/freeradius/dictionary.shasta
+share/examples/freeradius/dictionary.shiva
+share/examples/freeradius/dictionary.tunnel
+share/examples/freeradius/dictionary.usr
+share/examples/freeradius/dictionary.versanet
+share/examples/freeradius/experimental.conf
+share/examples/freeradius/hints
+share/examples/freeradius/huntgroups
+share/examples/freeradius/ldap.attrmap
+share/examples/freeradius/mssql.conf
+share/examples/freeradius/naslist
+share/examples/freeradius/naspasswd
+share/examples/freeradius/postgresql.conf
+share/examples/freeradius/proxy.conf
+share/examples/freeradius/radiusd.conf
+share/examples/freeradius/radiusd.conf.in
+share/examples/freeradius/realms
+share/examples/freeradius/snmp.conf
+share/examples/freeradius/sql.conf
+share/examples/freeradius/users
+share/examples/freeradius/x99.conf
+share/examples/freeradius/x99passwd.sample
+@dirrm share/examples/freeradius
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 86ce09858e1..c8bf546ed32 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/03/12 05:56:49 jmc Exp $
+$NetBSD: distinfo,v 1.4 2003/07/30 14:50:08 jmmv Exp $
SHA1 (freeradius-0.7.tar.gz) = 8f44f1f9fedf69b71aa4aed9c0b7222d012ee8d6
Size (freeradius-0.7.tar.gz) = 1659035 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = dc2c8c62ed2d11ebf682f7d9fcbaf7a410cbce0d
SHA1 (patch-ab) = 26092b974a27151d69ab87ae7ba42e67aeef448b
SHA1 (patch-ac) = 1abcc1f5282bface89cd71b2854218d2b60fdc97
SHA1 (patch-ad) = 8317bd7e8fa2c9efbb89a89140f019de6effa0b4
+SHA1 (patch-ae) = ce63ec70ae5a7d5e34c7f4dcb9adc7fdd349ecd9
diff --git a/net/freeradius/files/radiusd b/net/freeradius/files/radiusd
deleted file mode 100755
index d6022c0e551..00000000000
--- a/net/freeradius/files/radiusd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# PROVIDE: radiusd
-# REQUIRE: network
-
-name="radiusd"
-command="!!PREFIX!!/sbin/radiusd"
-pidfile="!!PREFIX!!/var/run/radiusd/radiusd.pid"
-
-if [ ! -d /etc/rc.d ]
-then
- echo -n ' ${name}'
- exec ${command} ${smbd_flags} ${command_args}
-fi
-
-. /etc/rc.subr
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/freeradius/files/radiusd.sh b/net/freeradius/files/radiusd.sh
new file mode 100644
index 00000000000..1ea5fc7649d
--- /dev/null
+++ b/net/freeradius/files/radiusd.sh
@@ -0,0 +1,27 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: radiusd.sh,v 1.1 2003/07/30 14:50:10 jmmv Exp $
+#
+# PROVIDE: radiusd
+# REQUIRE: network
+#
+
+if [ -f /etc/rc.subr ]
+then
+ . /etc/rc.subr
+fi
+
+name="radiusd"
+command="@PREFIX@/sbin/radiusd"
+pidfile="/var/run/radiusd/radiusd.pid"
+
+if [ -f /etc/rc.subr ]
+then
+ . /etc/rc.subr
+
+ load_rc_config $name
+ run_rc_command "$1"
+else
+ echo -n ' ${name}'
+ exec ${command} ${smbd_flags} ${command_args}
+fi
diff --git a/net/freeradius/patches/patch-ae b/net/freeradius/patches/patch-ae
new file mode 100644
index 00000000000..60142c5a533
--- /dev/null
+++ b/net/freeradius/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1 2003/07/30 14:50:11 jmmv Exp $
+
+--- Makefile.orig 2003-07-30 16:05:43.000000000 +0200
++++ Makefile
+@@ -22,7 +22,6 @@ clean:
+ install:
+ @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
+ $(INSTALL) -d -m 755 $(R)$(mandir);
+- $(INSTALL) -d -m 755 $(R)$(RUNDIR);
+ $(INSTALL) -d -m 700 $(R)$(logdir);
+ $(INSTALL) -d -m 700 $(R)$(radacctdir);
+ for i in 1 5 8; do \
+@@ -31,6 +30,8 @@ install:
+ $(INSTALL) -m 644 $$p $(R)$(mandir)/man$$i; \
+ done \
+ done
++
++install-etc:
+ @echo "Creating/updating files in $(R)$(raddbdir)"; \
+ $(INSTALL) -d -m 755 $(R)$(raddbdir); \
+ cd raddb; \