Update to alpha3.

Submitted by:	David W. Chapman Jr. <dwcjr@inethouston.net> (maintainer)
PR:		ports/26045

8 files changed, 88 insertions, 128 deletions

diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 6071ac1950bd..84711fcbd400 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.2.0a2
+PORTVERSION=	2.2.0a3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
 MASTER_SITE_SUBDIR= alpha
-DISTNAME=       samba-2.2.0-alpha2
+DISTNAME=       samba-2.2.0-alpha3
 
 MAINTAINER=	dwcjr@inethouston.net
 
@@ -42,13 +42,13 @@ CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		findsmb.1 make_smbcodepage.1 make_unicodemap.1 \
-		nmblookup.1 smbclient.1 smbcontrol.1 smbrun.1 \
+MAN1=		findsmb.1 make_smbcodepage.1 rpcclient.1 make_unicodemap.1 \
+		nmblookup.1 smbcacls.1 smbclient.1 smbcontrol.1 smbrun.1 \
 		smbsh.1 smbstatus.1 smbtar.1 testparm.1 \
 		testprns.1 wbinfo.1
 MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7
-MAN8=		nmbd.8 rpcclient.8 smbd.8 smbmnt.8 smbmount.8 \
+MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 \
 		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8
 
 post-install:
@@ -102,7 +102,7 @@ post-install:
 			${WRKDIR}/${DISTNAME}/docs/history ; do		\
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;		\
 	done
-	for i in faq htmldocs textdocs yodldocs ; do			\
+	for i in faq htmldocs textdocs ; do			\
 		${MKDIR} ${PREFIX}/share/doc/samba/$$i ;		\
 		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
 			if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
diff --git a/net/samba-devel/distinfo b/net/samba-devel/distinfo
index 2baac47653f3..ee19489cd22a 100644
--- a/net/samba-devel/distinfo
+++ b/net/samba-devel/distinfo
@@ -1 +1 @@
-MD5 (samba-2.2.0-alpha2.tar.gz) = d7b69f53b6e8354537d9151ecb4f16ea
+MD5 (samba-2.2.0-alpha3.tar.gz) = 871f8656c6aeb01020c55d334b9f047b
diff --git a/net/samba-devel/files/patch-aa b/net/samba-devel/files/patch-aa
index 6ba160fb1b10..25b34dc94d86 100644
--- a/net/samba-devel/files/patch-aa
+++ b/net/samba-devel/files/patch-aa
@@ -1,32 +1,20 @@
---- Makefile.in.orig	Mon Jan 29 19:42:53 2001
-+++ Makefile.in	Fri Feb  2 10:42:21 2001
-@@ -30,9 +30,9 @@
- BINDIR = @bindir@
- # we don't use sbindir because we want full compatibility with
- # the previous releases of Samba
--SBINDIR = @bindir@
-+SBINDIR = @sbindir@
- LIBDIR = @libdir@
--VARDIR = @localstatedir@
-+VARDIR = /var
- MANDIR = @mandir@
- 
- # The permissions to give the executables
-@@ -41,11 +41,11 @@
+--- Makefile.in.orig	Fri Mar 23 16:38:06 2001
++++ Makefile.in	Fri Mar 23 18:12:53 2001
+@@ -43,11 +43,11 @@
  # set these to where to find various files
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
--LOGFILEBASE = $(VARDIR)
+-LOGFILEBASE = @logfilebase@
 +LOGFILEBASE = $(VARDIR)/log
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
- DRIVERFILE = $(LIBDIR)/printers.def
+ CONFIGFILE = $(CONFIGDIR)/smb.conf
+ LMHOSTSFILE = $(CONFIGDIR)/lmhosts
+ DRIVERFILE = $(CONFIGDIR)/printers.def
 -PASSWD_PROGRAM = /bin/passwd
 +PASSWD_PROGRAM = /usr/bin/passwd
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -58,6 +58,9 @@
+@@ -60,6 +60,9 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -34,14 +22,14 @@
 +PIDFILEDIR = $(VARDIR)/run
 +
  # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
+ CODEPAGEDIR = @codepagedir@
  
-@@ -75,7 +78,7 @@
+@@ -78,7 +81,7 @@
  PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
  FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
  FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
 -FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
 +FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DFORMSFILE=\"$(FORMSFILE)\" -DNTDRIVERSDIR=\"$(NTDRIVERSDIR)\"
+ FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" 
  FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
  FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
index 173f2bdb3ccb..4ef468290da9 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -2,6 +2,7 @@ bin/smbclient
 bin/smbspool
 bin/testparm
 bin/testprns
+bin/smbcacls
 bin/smbstatus
 bin/smbcontrol
 bin/smbpasswd
@@ -20,6 +21,7 @@ etc/codepages/unicode_map.437
 etc/codepages/codepage.737
 etc/codepages/unicode_map.737
 etc/codepages/codepage.775
+etc/codepages/unicode_map.775
 etc/codepages/codepage.850
 etc/codepages/unicode_map.850
 etc/codepages/codepage.852
@@ -41,9 +43,12 @@ etc/codepages/unicode_map.ISO8859-1
 etc/codepages/unicode_map.ISO8859-2
 etc/codepages/unicode_map.ISO8859-5
 etc/codepages/unicode_map.ISO8859-7
+etc/codepages/unicode_map.ISO8859-9
+etc/codepages/unicode_map.ISO8859-13
+etc/codepages/unicode_map.ISO8859-15
 etc/codepages/codepage.857
 etc/codepages/unicode_map.857
-etc/codepages/unicode_map.ISO8859-9
+etc/codepages/unicode_map.KOI8-R
 etc/smb.conf.default
 sbin/smbd
 sbin/nmbd
@@ -89,19 +94,27 @@ share/doc/samba/faq/sambafaq.sgml
 share/doc/samba/faq/sambafaq.txt
 share/doc/samba/htmldocs/DOMAIN_MEMBER.html
 share/doc/samba/htmldocs/NT_Security.html
+share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
+share/doc/samba/htmldocs/UNIX_INSTALL.html
 share/doc/samba/htmldocs/findsmb.1.html
 share/doc/samba/htmldocs/lmhosts.5.html
 share/doc/samba/htmldocs/make_smbcodepage.1.html
+share/doc/samba/htmldocs/msdfs_setup.html
 share/doc/samba/htmldocs/nmbd.8.html
 share/doc/samba/htmldocs/nmblookup.1.html
-share/doc/samba/htmldocs/rpcclient.8.html
+share/doc/samba/htmldocs/printer_driver2.html
+share/doc/samba/htmldocs/rpcclient.1.html
 share/doc/samba/htmldocs/samba-pdc-faq.html
 share/doc/samba/htmldocs/samba-pdc-howto.html
 share/doc/samba/htmldocs/samba.7.html
 share/doc/samba/htmldocs/smb.conf.5.html
+share/doc/samba/htmldocs/smbcacls.1.html
 share/doc/samba/htmldocs/smbclient.1.html
 share/doc/samba/htmldocs/smbcontrol.1.html
 share/doc/samba/htmldocs/smbd.8.html
+share/doc/samba/htmldocs/smbmnt.8.html
+share/doc/samba/htmldocs/smbmount.8.html
+share/doc/samba/htmldocs/smbumount.8.html
 share/doc/samba/htmldocs/smbpasswd.5.html
 share/doc/samba/htmldocs/smbpasswd.8.html
 share/doc/samba/htmldocs/smbrun.1.html
@@ -114,6 +127,7 @@ share/doc/samba/htmldocs/testparm.1.html
 share/doc/samba/htmldocs/testprns.1.html
 share/doc/samba/htmldocs/wbinfo.1.html
 share/doc/samba/htmldocs/wfw_slip.htm
+share/doc/samba/htmldocs/winbind.html
 share/doc/samba/htmldocs/winbindd.8.html
 share/doc/samba/textdocs/Application_Serving.txt
 share/doc/samba/textdocs/BROWSING-Config.txt
@@ -125,8 +139,6 @@ share/doc/samba/textdocs/DIAGNOSIS.txt
 share/doc/samba/textdocs/DNIX.txt
 share/doc/samba/textdocs/DOMAIN.txt
 share/doc/samba/textdocs/DOMAIN_CONTROL.txt
-share/doc/samba/textdocs/DOMAIN_MEMBER.txt
-share/doc/samba/textdocs/ENCRYPTION.txt
 share/doc/samba/textdocs/Faxing.txt
 share/doc/samba/textdocs/GOTCHAS.txt
 share/doc/samba/textdocs/HINTS.txt
@@ -135,11 +147,9 @@ share/doc/samba/textdocs/Imprints.txt
 share/doc/samba/textdocs/MIRRORS.txt
 share/doc/samba/textdocs/Macintosh_Clients.txt
 share/doc/samba/textdocs/NTDOMAIN.txt
-share/doc/samba/textdocs/NT_Security.txt
 share/doc/samba/textdocs/NetBIOS.txt
 share/doc/samba/textdocs/OS2-Client-HOWTO.txt
 share/doc/samba/textdocs/PRINTER_DRIVER.txt
-share/doc/samba/textdocs/PRINTER_DRIVER2.txt
 share/doc/samba/textdocs/PROFILES.txt
 share/doc/samba/textdocs/PROJECTS
 share/doc/samba/textdocs/Passwords.txt
@@ -157,7 +167,6 @@ share/doc/samba/textdocs/Speed2.txt
 share/doc/samba/textdocs/Support.txt
 share/doc/samba/textdocs/Tracing.txt
 share/doc/samba/textdocs/UNIX-SMB.txt
-share/doc/samba/textdocs/UNIX_INSTALL.txt
 share/doc/samba/textdocs/UNIX_SECURITY.txt
 share/doc/samba/textdocs/Win95.txt
 share/doc/samba/textdocs/WinNT.txt
@@ -168,31 +177,6 @@ share/doc/samba/textdocs/logo.ps
 share/doc/samba/textdocs/samba-pdc-faq.txt
 share/doc/samba/textdocs/samba-pdc-howto.txt
 share/doc/samba/textdocs/security_level.txt
-share/doc/samba/yodldocs/DOMAIN_MEMBER.yo
-share/doc/samba/yodldocs/NT_Security.yo
-share/doc/samba/yodldocs/findsmb.1.yo
-share/doc/samba/yodldocs/lmhosts.5.yo
-share/doc/samba/yodldocs/make_smbcodepage.1.yo
-share/doc/samba/yodldocs/nmbd.8.yo
-share/doc/samba/yodldocs/nmblookup.1.yo
-share/doc/samba/yodldocs/rpcclient.8.yo
-share/doc/samba/yodldocs/samba.7.yo
-share/doc/samba/yodldocs/smb.conf.5.yo
-share/doc/samba/yodldocs/smbclient.1.yo
-share/doc/samba/yodldocs/smbcontrol.1.yo
-share/doc/samba/yodldocs/smbd.8.yo
-share/doc/samba/yodldocs/smbpasswd.5.yo
-share/doc/samba/yodldocs/smbpasswd.8.yo
-share/doc/samba/yodldocs/smbrun.1.yo
-share/doc/samba/yodldocs/smbsh.1.yo
-share/doc/samba/yodldocs/smbspool.8.yo
-share/doc/samba/yodldocs/smbstatus.1.yo
-share/doc/samba/yodldocs/smbtar.1.yo
-share/doc/samba/yodldocs/swat.8.yo
-share/doc/samba/yodldocs/testparm.1.yo
-share/doc/samba/yodldocs/testprns.1.yo
-share/doc/samba/yodldocs/wbinfo.1.yo
-share/doc/samba/yodldocs/winbindd.8.yo
 share/doc/samba/README.swat
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
@@ -239,19 +223,27 @@ share/examples/samba/README
 share/swat/help/welcome.html
 share/swat/help/DOMAIN_MEMBER.html
 share/swat/help/NT_Security.html
+share/swat/help/Samba-HOWTO-Collection.html
+share/swat/help/UNIX_INSTALL.html
 share/swat/help/findsmb.1.html
 share/swat/help/lmhosts.5.html
 share/swat/help/make_smbcodepage.1.html
+share/swat/help/msdfs_setup.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
-share/swat/help/rpcclient.8.html
+share/swat/help/printer_driver2.html
+share/swat/help/rpcclient.1.html
 share/swat/help/samba-pdc-faq.html
 share/swat/help/samba-pdc-howto.html
 share/swat/help/samba.7.html
 share/swat/help/smb.conf.5.html
+share/swat/help/smbcacls.1.html
 share/swat/help/smbclient.1.html
 share/swat/help/smbcontrol.1.html
 share/swat/help/smbd.8.html
+share/swat/help/smbmnt.8.html
+share/swat/help/smbmount.8.html
+share/swat/help/smbumount.8.html
 share/swat/help/smbpasswd.5.html
 share/swat/help/smbpasswd.8.html
 share/swat/help/smbrun.1.html
@@ -263,6 +255,7 @@ share/swat/help/swat.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
 share/swat/help/wbinfo.1.html
+share/swat/help/winbind.html
 share/swat/help/winbindd.8.html
 share/swat/images/globals.gif
 share/swat/images/home.gif
@@ -278,7 +271,6 @@ share/swat/include/header.html
 @dirrm share/doc/samba/faq
 @dirrm share/doc/samba/htmldocs
 @dirrm share/doc/samba/textdocs
-@dirrm share/doc/samba/yodldocs
 @dirrm share/doc/samba
 @dirrm share/examples/samba/simple
 @dirrm share/examples/samba/tridge
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 6071ac1950bd..84711fcbd400 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.2.0a2
+PORTVERSION=	2.2.0a3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
 MASTER_SITE_SUBDIR= alpha
-DISTNAME=       samba-2.2.0-alpha2
+DISTNAME=       samba-2.2.0-alpha3
 
 MAINTAINER=	dwcjr@inethouston.net
 
@@ -42,13 +42,13 @@ CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		findsmb.1 make_smbcodepage.1 make_unicodemap.1 \
-		nmblookup.1 smbclient.1 smbcontrol.1 smbrun.1 \
+MAN1=		findsmb.1 make_smbcodepage.1 rpcclient.1 make_unicodemap.1 \
+		nmblookup.1 smbcacls.1 smbclient.1 smbcontrol.1 smbrun.1 \
 		smbsh.1 smbstatus.1 smbtar.1 testparm.1 \
 		testprns.1 wbinfo.1
 MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7
-MAN8=		nmbd.8 rpcclient.8 smbd.8 smbmnt.8 smbmount.8 \
+MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 \
 		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8
 
 post-install:
@@ -102,7 +102,7 @@ post-install:
 			${WRKDIR}/${DISTNAME}/docs/history ; do		\
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;		\
 	done
-	for i in faq htmldocs textdocs yodldocs ; do			\
+	for i in faq htmldocs textdocs ; do			\
 		${MKDIR} ${PREFIX}/share/doc/samba/$$i ;		\
 		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
 			if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 2baac47653f3..ee19489cd22a 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-2.2.0-alpha2.tar.gz) = d7b69f53b6e8354537d9151ecb4f16ea
+MD5 (samba-2.2.0-alpha3.tar.gz) = 871f8656c6aeb01020c55d334b9f047b
diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa
index 6ba160fb1b10..25b34dc94d86 100644
--- a/net/samba3/files/patch-aa
+++ b/net/samba3/files/patch-aa
@@ -1,32 +1,20 @@
---- Makefile.in.orig	Mon Jan 29 19:42:53 2001
-+++ Makefile.in	Fri Feb  2 10:42:21 2001
-@@ -30,9 +30,9 @@
- BINDIR = @bindir@
- # we don't use sbindir because we want full compatibility with
- # the previous releases of Samba
--SBINDIR = @bindir@
-+SBINDIR = @sbindir@
- LIBDIR = @libdir@
--VARDIR = @localstatedir@
-+VARDIR = /var
- MANDIR = @mandir@
- 
- # The permissions to give the executables
-@@ -41,11 +41,11 @@
+--- Makefile.in.orig	Fri Mar 23 16:38:06 2001
++++ Makefile.in	Fri Mar 23 18:12:53 2001
+@@ -43,11 +43,11 @@
  # set these to where to find various files
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
--LOGFILEBASE = $(VARDIR)
+-LOGFILEBASE = @logfilebase@
 +LOGFILEBASE = $(VARDIR)/log
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
- DRIVERFILE = $(LIBDIR)/printers.def
+ CONFIGFILE = $(CONFIGDIR)/smb.conf
+ LMHOSTSFILE = $(CONFIGDIR)/lmhosts
+ DRIVERFILE = $(CONFIGDIR)/printers.def
 -PASSWD_PROGRAM = /bin/passwd
 +PASSWD_PROGRAM = /usr/bin/passwd
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -58,6 +58,9 @@
+@@ -60,6 +60,9 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -34,14 +22,14 @@
 +PIDFILEDIR = $(VARDIR)/run
 +
  # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
+ CODEPAGEDIR = @codepagedir@
  
-@@ -75,7 +78,7 @@
+@@ -78,7 +81,7 @@
  PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
  FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
  FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
 -FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
 +FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DFORMSFILE=\"$(FORMSFILE)\" -DNTDRIVERSDIR=\"$(NTDRIVERSDIR)\"
+ FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" 
  FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
  FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 173f2bdb3ccb..4ef468290da9 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -2,6 +2,7 @@ bin/smbclient
 bin/smbspool
 bin/testparm
 bin/testprns
+bin/smbcacls
 bin/smbstatus
 bin/smbcontrol
 bin/smbpasswd
@@ -20,6 +21,7 @@ etc/codepages/unicode_map.437
 etc/codepages/codepage.737
 etc/codepages/unicode_map.737
 etc/codepages/codepage.775
+etc/codepages/unicode_map.775
 etc/codepages/codepage.850
 etc/codepages/unicode_map.850
 etc/codepages/codepage.852
@@ -41,9 +43,12 @@ etc/codepages/unicode_map.ISO8859-1
 etc/codepages/unicode_map.ISO8859-2
 etc/codepages/unicode_map.ISO8859-5
 etc/codepages/unicode_map.ISO8859-7
+etc/codepages/unicode_map.ISO8859-9
+etc/codepages/unicode_map.ISO8859-13
+etc/codepages/unicode_map.ISO8859-15
 etc/codepages/codepage.857
 etc/codepages/unicode_map.857
-etc/codepages/unicode_map.ISO8859-9
+etc/codepages/unicode_map.KOI8-R
 etc/smb.conf.default
 sbin/smbd
 sbin/nmbd
@@ -89,19 +94,27 @@ share/doc/samba/faq/sambafaq.sgml
 share/doc/samba/faq/sambafaq.txt
 share/doc/samba/htmldocs/DOMAIN_MEMBER.html
 share/doc/samba/htmldocs/NT_Security.html
+share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
+share/doc/samba/htmldocs/UNIX_INSTALL.html
 share/doc/samba/htmldocs/findsmb.1.html
 share/doc/samba/htmldocs/lmhosts.5.html
 share/doc/samba/htmldocs/make_smbcodepage.1.html
+share/doc/samba/htmldocs/msdfs_setup.html
 share/doc/samba/htmldocs/nmbd.8.html
 share/doc/samba/htmldocs/nmblookup.1.html
-share/doc/samba/htmldocs/rpcclient.8.html
+share/doc/samba/htmldocs/printer_driver2.html
+share/doc/samba/htmldocs/rpcclient.1.html
 share/doc/samba/htmldocs/samba-pdc-faq.html
 share/doc/samba/htmldocs/samba-pdc-howto.html
 share/doc/samba/htmldocs/samba.7.html
 share/doc/samba/htmldocs/smb.conf.5.html
+share/doc/samba/htmldocs/smbcacls.1.html
 share/doc/samba/htmldocs/smbclient.1.html
 share/doc/samba/htmldocs/smbcontrol.1.html
 share/doc/samba/htmldocs/smbd.8.html
+share/doc/samba/htmldocs/smbmnt.8.html
+share/doc/samba/htmldocs/smbmount.8.html
+share/doc/samba/htmldocs/smbumount.8.html
 share/doc/samba/htmldocs/smbpasswd.5.html
 share/doc/samba/htmldocs/smbpasswd.8.html
 share/doc/samba/htmldocs/smbrun.1.html
@@ -114,6 +127,7 @@ share/doc/samba/htmldocs/testparm.1.html
 share/doc/samba/htmldocs/testprns.1.html
 share/doc/samba/htmldocs/wbinfo.1.html
 share/doc/samba/htmldocs/wfw_slip.htm
+share/doc/samba/htmldocs/winbind.html
 share/doc/samba/htmldocs/winbindd.8.html
 share/doc/samba/textdocs/Application_Serving.txt
 share/doc/samba/textdocs/BROWSING-Config.txt
@@ -125,8 +139,6 @@ share/doc/samba/textdocs/DIAGNOSIS.txt
 share/doc/samba/textdocs/DNIX.txt
 share/doc/samba/textdocs/DOMAIN.txt
 share/doc/samba/textdocs/DOMAIN_CONTROL.txt
-share/doc/samba/textdocs/DOMAIN_MEMBER.txt
-share/doc/samba/textdocs/ENCRYPTION.txt
 share/doc/samba/textdocs/Faxing.txt
 share/doc/samba/textdocs/GOTCHAS.txt
 share/doc/samba/textdocs/HINTS.txt
@@ -135,11 +147,9 @@ share/doc/samba/textdocs/Imprints.txt
 share/doc/samba/textdocs/MIRRORS.txt
 share/doc/samba/textdocs/Macintosh_Clients.txt
 share/doc/samba/textdocs/NTDOMAIN.txt
-share/doc/samba/textdocs/NT_Security.txt
 share/doc/samba/textdocs/NetBIOS.txt
 share/doc/samba/textdocs/OS2-Client-HOWTO.txt
 share/doc/samba/textdocs/PRINTER_DRIVER.txt
-share/doc/samba/textdocs/PRINTER_DRIVER2.txt
 share/doc/samba/textdocs/PROFILES.txt
 share/doc/samba/textdocs/PROJECTS
 share/doc/samba/textdocs/Passwords.txt
@@ -157,7 +167,6 @@ share/doc/samba/textdocs/Speed2.txt
 share/doc/samba/textdocs/Support.txt
 share/doc/samba/textdocs/Tracing.txt
 share/doc/samba/textdocs/UNIX-SMB.txt
-share/doc/samba/textdocs/UNIX_INSTALL.txt
 share/doc/samba/textdocs/UNIX_SECURITY.txt
 share/doc/samba/textdocs/Win95.txt
 share/doc/samba/textdocs/WinNT.txt
@@ -168,31 +177,6 @@ share/doc/samba/textdocs/logo.ps
 share/doc/samba/textdocs/samba-pdc-faq.txt
 share/doc/samba/textdocs/samba-pdc-howto.txt
 share/doc/samba/textdocs/security_level.txt
-share/doc/samba/yodldocs/DOMAIN_MEMBER.yo
-share/doc/samba/yodldocs/NT_Security.yo
-share/doc/samba/yodldocs/findsmb.1.yo
-share/doc/samba/yodldocs/lmhosts.5.yo
-share/doc/samba/yodldocs/make_smbcodepage.1.yo
-share/doc/samba/yodldocs/nmbd.8.yo
-share/doc/samba/yodldocs/nmblookup.1.yo
-share/doc/samba/yodldocs/rpcclient.8.yo
-share/doc/samba/yodldocs/samba.7.yo
-share/doc/samba/yodldocs/smb.conf.5.yo
-share/doc/samba/yodldocs/smbclient.1.yo
-share/doc/samba/yodldocs/smbcontrol.1.yo
-share/doc/samba/yodldocs/smbd.8.yo
-share/doc/samba/yodldocs/smbpasswd.5.yo
-share/doc/samba/yodldocs/smbpasswd.8.yo
-share/doc/samba/yodldocs/smbrun.1.yo
-share/doc/samba/yodldocs/smbsh.1.yo
-share/doc/samba/yodldocs/smbspool.8.yo
-share/doc/samba/yodldocs/smbstatus.1.yo
-share/doc/samba/yodldocs/smbtar.1.yo
-share/doc/samba/yodldocs/swat.8.yo
-share/doc/samba/yodldocs/testparm.1.yo
-share/doc/samba/yodldocs/testprns.1.yo
-share/doc/samba/yodldocs/wbinfo.1.yo
-share/doc/samba/yodldocs/winbindd.8.yo
 share/doc/samba/README.swat
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
@@ -239,19 +223,27 @@ share/examples/samba/README
 share/swat/help/welcome.html
 share/swat/help/DOMAIN_MEMBER.html
 share/swat/help/NT_Security.html
+share/swat/help/Samba-HOWTO-Collection.html
+share/swat/help/UNIX_INSTALL.html
 share/swat/help/findsmb.1.html
 share/swat/help/lmhosts.5.html
 share/swat/help/make_smbcodepage.1.html
+share/swat/help/msdfs_setup.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
-share/swat/help/rpcclient.8.html
+share/swat/help/printer_driver2.html
+share/swat/help/rpcclient.1.html
 share/swat/help/samba-pdc-faq.html
 share/swat/help/samba-pdc-howto.html
 share/swat/help/samba.7.html
 share/swat/help/smb.conf.5.html
+share/swat/help/smbcacls.1.html
 share/swat/help/smbclient.1.html
 share/swat/help/smbcontrol.1.html
 share/swat/help/smbd.8.html
+share/swat/help/smbmnt.8.html
+share/swat/help/smbmount.8.html
+share/swat/help/smbumount.8.html
 share/swat/help/smbpasswd.5.html
 share/swat/help/smbpasswd.8.html
 share/swat/help/smbrun.1.html
@@ -263,6 +255,7 @@ share/swat/help/swat.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
 share/swat/help/wbinfo.1.html
+share/swat/help/winbind.html
 share/swat/help/winbindd.8.html
 share/swat/images/globals.gif
 share/swat/images/home.gif
@@ -278,7 +271,6 @@ share/swat/include/header.html
 @dirrm share/doc/samba/faq
 @dirrm share/doc/samba/htmldocs
 @dirrm share/doc/samba/textdocs
-@dirrm share/doc/samba/yodldocs
 @dirrm share/doc/samba
 @dirrm share/examples/samba/simple
 @dirrm share/examples/samba/tridge