Pullup ticket #3078 - requested by sborrill:

net/samba: build fix and bug fix
net/samba33: build fix and bug fix

Revisions pulled up:
- net/samba/Makefile				1.199-1.200
- net/samba/files/winbindd.sh			1.5
- net/samba33/Makefile				1.8-1.9
---
Module Name:    pkgsrc
Committed By:   sborrill
Date:           Wed Apr 14 14:51:01 UTC 2010

Modified Files:
         pkgsrc/net/samba: Makefile
         pkgsrc/net/samba33: Makefile

Log Message:
Add openssl bl3.mk file so that we play nicely with PREFER_PKGSRC+=openssl
---
Module Name:    pkgsrc
Committed By:   sborrill
Date:           Thu Apr 15 09:36:50 UTC 2010

Modified Files:
         pkgsrc/net/samba/files: winbindd.sh

Log Message:
winbindd does not have a -B flag. As far as I can see, it never did have
(It was added to this rc.d script as part of the upgrade to 3.0.20b, but
winbindd in 3.0.20b does not have a -B flag).
---
Module Name:    pkgsrc
Committed By:   sborrill
Date:           Thu Apr 15 09:38:09 UTC 2010

Modified Files:
         pkgsrc/net/samba: Makefile
         pkgsrc/net/samba33: Makefile

Log Message:
Bump PKGREVISION due to removing -B flag from winbindd rc.d script

3 files changed, 7 insertions, 5 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index ae675bf80e2..37712e0dc12 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.198 2010/03/08 22:19:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.198.2.1 2010/04/15 18:07:23 tron Exp $
 
 .include "Makefile.mirrors"
 
 DISTNAME=		samba-${VERSION}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		net
 MASTER_SITES=		${SAMBA_MIRRORS:=old-versions/}
 
@@ -170,5 +170,6 @@ post-install: install-samba-lib-symlinks
 	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/libmsrpc.h \
 		${DESTDIR}${PREFIX}/include/libsmbclient.h
 
+.include "../../security/openssl/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/files/winbindd.sh b/net/samba/files/winbindd.sh
index 2f1542a1336..9926c5f3672 100644
--- a/net/samba/files/winbindd.sh
+++ b/net/samba/files/winbindd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: winbindd.sh,v 1.4 2006/05/03 23:23:06 jlam Exp $
+# $NetBSD: winbindd.sh,v 1.4.36.1 2010/04/15 18:07:23 tron Exp $
 #
 # PROVIDE: winbindd
 # REQUIRE: DAEMON
@@ -12,7 +12,6 @@ rcvar=$name
 command="@PREFIX@/sbin/${name}"
 required_files="@SAMBA_ETCDIR@/smb.conf"
 extra_commands="reload"
-command_args="-B"
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/net/samba33/Makefile b/net/samba33/Makefile
index a2cffa4c19c..c9330351879 100644
--- a/net/samba33/Makefile
+++ b/net/samba33/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/03/09 01:33:26 taca Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2010/04/15 18:07:23 tron Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
 DISTNAME=		samba-${VERSION}
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${SAMBA_MIRRORS:=old-versions/}
 
@@ -146,5 +147,6 @@ post-install:
 	cd ${WRKSRC}/script; ${INSTALL_SCRIPT} updatesmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR}
 	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/*.h
 
+.include "../../security/openssl/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"