From 183c016e0d992c99895096aff19aa182fa625f1b Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 21 Dec 2005 04:17:49 +0000
Subject: Add a non-conflicting definition for load_rc_config_var so that
 platforms with older versions of /etc/rc.subr can run smbd.sh and winbindd.sh
 without updating /etc/rc.subr.

Bump PKGREVISION to 2.
---
 security/heimdal/Makefile          |  4 ++--
 security/heimdal/files/kadmind.sh  | 15 ++++++++++++++-
 security/heimdal/files/kpasswdd.sh | 15 ++++++++++++++-
 3 files changed, 30 insertions(+), 4 deletions(-)

(limited to 'security')

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index b787c22dd71..0ae837ab6ae 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2005/12/05 23:55:17 rillig Exp $
+# $NetBSD: Makefile,v 1.49 2005/12/21 04:17:49 jlam Exp $
 
 DISTNAME=	heimdal-0.7.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.pdc.kth.se/pub/heimdal/src/	\
 		ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/
diff --git a/security/heimdal/files/kadmind.sh b/security/heimdal/files/kadmind.sh
index e9a3171cdeb..4639d75dd93 100644
--- a/security/heimdal/files/kadmind.sh
+++ b/security/heimdal/files/kadmind.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: kadmind.sh,v 1.1 2005/10/26 15:12:45 jlam Exp $
+# $NetBSD: kadmind.sh,v 1.2 2005/12/21 04:17:49 jlam Exp $
 #
 # PROVIDE: kadmind
 # REQUIRE: NETWORKING
@@ -15,6 +15,19 @@ command_args="& sleep 2"
 required_files="@PKG_SYSCONFDIR@/krb5.conf"
 required_vars="kdc"
 
+# load_rc_config_var() from /etc/rc.subr on the netbsd-3 branch, for
+# the benefit of platforms with older versions of /etc/rc.subr.
+#
+load_rc_config_var()
+{
+	eval $(eval '(
+		load_rc_config '$1' >/dev/null;
+		if [ -n "${'$2'}" -o "${'$2'-UNSET}" != "UNSET" ]; then
+			echo '$2'=\'\''${'$2'}\'\'';
+		fi
+	)' )
+}
+
 load_rc_config $name
 load_rc_config_var kdc kdc
 run_rc_command "$1"
diff --git a/security/heimdal/files/kpasswdd.sh b/security/heimdal/files/kpasswdd.sh
index b6fb0f88d5d..1202c14b638 100644
--- a/security/heimdal/files/kpasswdd.sh
+++ b/security/heimdal/files/kpasswdd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: kpasswdd.sh,v 1.1 2005/10/26 15:12:45 jlam Exp $
+# $NetBSD: kpasswdd.sh,v 1.2 2005/12/21 04:17:49 jlam Exp $
 #
 # PROVIDE: kpasswdd
 # REQUIRE: NETWORKING
@@ -15,6 +15,19 @@ command_args="& sleep 2"
 required_files="@PKG_SYSCONFDIR@/krb5.conf"
 required_vars="kdc"
 
+# load_rc_config_var() from /etc/rc.subr on the netbsd-3 branch, for
+# the benefit of platforms with older versions of /etc/rc.subr.
+#
+load_rc_config_var()
+{
+	eval $(eval '(
+		load_rc_config '$1' >/dev/null;
+		if [ -n "${'$2'}" -o "${'$2'-UNSET}" != "UNSET" ]; then
+			echo '$2'=\'\''${'$2'}\'\'';
+		fi
+	)' )
+}
+
 load_rc_config $name
 load_rc_config_var kdc kdc
 run_rc_command "$1"
-- 
cgit v1.2.3