[pkgsrc/trunk]: pkgsrc/net/samba Fix PR pkg/32080 by adding a non-conflicting...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ff8b4555da5
branches:  trunk
changeset: 504779:0ff8b4555da5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Dec 21 04:17:53 2005 +0000

description:
Fix PR pkg/32080 by adding 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 3.

diffstat:

 net/samba/Makefile          |   4 ++--
 net/samba/files/smbd.sh     |  15 ++++++++++++++-
 net/samba/files/winbindd.sh |  15 ++++++++++++++-
 3 files changed, 30 insertions(+), 4 deletions(-)

diffs (78 lines):

diff -r bc22ccc310f7 -r 0ff8b4555da5 net/samba/Makefile
--- a/net/samba/Makefile        Wed Dec 21 04:17:49 2005 +0000
+++ b/net/samba/Makefile        Wed Dec 21 04:17:53 2005 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.153 2005/12/17 05:20:22 jlam Exp $
+# $NetBSD: Makefile,v 1.154 2005/12/21 04:17:53 jlam Exp $
 
 .include "Makefile.mirrors"
 
 DISTNAME=              samba-3.0.20b
 PKGNAME=               samba-3.0.20.2
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            net
 MASTER_SITES=          ${SAMBA_MIRRORS:=old-versions/}
 DIST_SUBDIR=           ${DISTNAME}
diff -r bc22ccc310f7 -r 0ff8b4555da5 net/samba/files/smbd.sh
--- a/net/samba/files/smbd.sh   Wed Dec 21 04:17:49 2005 +0000
+++ b/net/samba/files/smbd.sh   Wed Dec 21 04:17:53 2005 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: smbd.sh,v 1.11 2005/11/14 08:05:27 jlam Exp $
+# $NetBSD: smbd.sh,v 1.12 2005/12/21 04:17:53 jlam Exp $
 #
 # PROVIDE: smbd
 # REQUIRE: nmbd
@@ -16,6 +16,19 @@
 command_args="-D"              # _must_ start as daemon from rc.d;
                                # add more flags through ${${name}_flags}
 
+# 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 nmbd nmbd
 run_rc_command "$1"
diff -r bc22ccc310f7 -r 0ff8b4555da5 net/samba/files/winbindd.sh
--- a/net/samba/files/winbindd.sh       Wed Dec 21 04:17:49 2005 +0000
+++ b/net/samba/files/winbindd.sh       Wed Dec 21 04:17:53 2005 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: winbindd.sh,v 1.2 2005/11/14 08:05:27 jlam Exp $
+# $NetBSD: winbindd.sh,v 1.3 2005/12/21 04:17:53 jlam Exp $
 #
 # PROVIDE: winbindd
 # REQUIRE: nmbd
@@ -15,6 +15,19 @@
 extra_commands="reload"
 command_args="-B"
 
+# 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 nmbd nmbd
 run_rc_command "$1"