From 0d3fe084785cd36f94c1af029c2579e67cdc4ee1 Mon Sep 17 00:00:00 2001
From: seb <seb@pkgsrc.org>
Date: Wed, 9 Feb 2005 09:14:26 +0000
Subject: Obey PKG_SYSCONFBASEDIR. Fix the rc.d script: add rcvar definition
 and no need to source /etc/rc.subr twice.

Bump PKGREVISION to 7.
---
 net/freeradius/Makefile         | 6 +++---
 net/freeradius/files/radiusd.sh | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'net')

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 19bffeb10f6..57a788afbd2 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/12/28 02:47:46 reed Exp $
+# $NetBSD: Makefile,v 1.23 2005/02/09 09:14:26 seb Exp $
 
 DISTNAME=	freeradius-1.0.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
@@ -31,7 +31,7 @@ FILES_SUBST+=		ROOT_GROUP=${ROOT_GROUP}
 
 CONFIGURE_ARGS+=	--with-logdir=${VARBASE}/log
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--disable-ltdl-install
 CONFIGURE_ARGS+=	--with-ltdl-lib=${PREFIX}/lib
 CONFIGURE_ARGS+=	--with-ltdl-include=${PREFIX}/include
diff --git a/net/freeradius/files/radiusd.sh b/net/freeradius/files/radiusd.sh
index afb6b678379..5c2eadeacaf 100644
--- a/net/freeradius/files/radiusd.sh
+++ b/net/freeradius/files/radiusd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: radiusd.sh,v 1.4 2004/12/22 10:07:21 adrianp Exp $
+# $NetBSD: radiusd.sh,v 1.5 2005/02/09 09:14:26 seb Exp $
 #
 # PROVIDE: radiusd
 # REQUIRE: network
@@ -12,6 +12,7 @@ then
 fi
 
 name="radiusd"
+rcvar=${name}
 command="@PREFIX@/sbin/radiusd"
 pidfile="@VARBASE@/run/radiusd/radiusd.pid"
 start_precmd="radiusd_precmd"
@@ -27,8 +28,6 @@ radiusd_precmd()
 
 if [ -f /etc/rc.subr ]
 then
-	. /etc/rc.subr
-
 	load_rc_config $name
 	run_rc_command "$1"
 else
-- 
cgit v1.2.3