6 files changed, 240 insertions, 238 deletions

diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 46a2e26e2b5c..a1575cedef1b 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0a20
+PORTVERSION=	3.0.0.b1
+PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://us4.samba.org/samba/ftp/%SUBDIR%/
-MASTER_SITE_SUBDIR=	alpha old
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/a/alpha/}
+MASTER_SITE_SUBDIR=	beta alpha old
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
 
 MAINTAINER=	dwcjr@FreeBSD.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
@@ -27,7 +28,6 @@ CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
 .endif
 
-
 # directories
 VARDIR=		/var
 SAMBA_SPOOL=	${VARDIR}/spool/samba
@@ -41,6 +41,7 @@ DOCSDIR=	${PREFIX}/share/doc/samba
 
 NO_LATEST_LINK=	yes
 USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER=	253
 CONFIGURE_ARGS=	--libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
@@ -91,12 +92,12 @@ CONFIGURE_ARGS+=	--with-libiconv
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		findsmb.1 make_smbcodepage.1 make_unicodemap.1 nmblookup.1 \
+MAN1=		findsmb.1 nmblookup.1 \
 		rpcclient.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
-		smbstatus.1 smbtar.1 testparm.1 testprns.1 wbinfo.1
+		smbstatus.1 smbtar.1 testparm.1 testprns.1 wbinfo.1 vfstest.1
 MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7
-MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 \
+MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 net.8 pdbedit.8 \
 		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8
 
 post-install:
diff --git a/net/samba-devel/distinfo b/net/samba-devel/distinfo
index a081eab1d7a7..374fb4850cff 100644
--- a/net/samba-devel/distinfo
+++ b/net/samba-devel/distinfo
@@ -1 +1 @@
-MD5 (samba-3.0alpha20.tar.bz2) = 2fe6a786d717998871889ba8d72ec521
+MD5 (samba-3.0.0beta1.tar.bz2) = e212b1828fe9f4784059b494a5782c95
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
index 9f0d17b143b9..7223166b96ee 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -1,30 +1,42 @@
-bin/addtosmbpass
-bin/convert_smbpasswd
+bin/editreg
+bin/findsmb
 bin/make_smbpasswd
+bin/net
 bin/nmblookup
+bin/ntlm_auth
 bin/pdbedit
+bin/profiles
 bin/rpcclient
 bin/smbcacls
 bin/smbclient
 bin/smbcontrol
-bin/smbgroupedit
+bin/smbcquotas
 bin/smbpasswd
 bin/smbspool
 bin/smbstatus
 bin/smbtar
 bin/smbtree
+bin/tdbbackup
 bin/testparm
 bin/testprns
 etc/rc.d/samba.sh.sample
+etc/lowcase.dat
 etc/smb.conf.default
+etc/upcase.dat
+etc/valid.dat
 sbin/nmbd
 sbin/smbd
 sbin/swat
+%%PORTDOCS%%share/doc/samba/faq/clientapp.html
+%%PORTDOCS%%share/doc/samba/faq/errors.html
+%%PORTDOCS%%share/doc/samba/faq/general.html
+%%PORTDOCS%%share/doc/samba/faq/install.html
+%%PORTDOCS%%share/doc/samba/faq/samba-faq.html
 %%PORTDOCS%%share/doc/samba/COPYING
 %%PORTDOCS%%share/doc/samba/Manifest
-%%PORTDOCS%%share/doc/samba/README
 %%PORTDOCS%%share/doc/samba/README.FreeBSD
 %%PORTDOCS%%share/doc/samba/README.swat
+%%PORTDOCS%%share/doc/samba/README
 %%PORTDOCS%%share/doc/samba/Read-Manifest-Now
 %%PORTDOCS%%share/doc/samba/Registry/NT4-Locking.reg
 %%PORTDOCS%%share/doc/samba/Registry/NT4_PlainPassword.reg
@@ -34,70 +46,59 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/Registry/Win9X-CacheHandling.reg
 %%PORTDOCS%%share/doc/samba/Registry/WinME_PlainPassword.reg
 %%PORTDOCS%%share/doc/samba/Registry/WinXP_SignOrSeal.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win-NT-2K-XP-DeleteRoamingProfile.reg
+%%PORTDOCS%%share/doc/samba/Registry/WinXP_PlainPassword.reg
 %%PORTDOCS%%share/doc/samba/Registry/WindowsTerminalServer.reg
 %%PORTDOCS%%share/doc/samba/Roadmap
 %%PORTDOCS%%share/doc/samba/THANKS
 %%PORTDOCS%%share/doc/samba/WHATSNEW.txt
 %%PORTDOCS%%share/doc/samba/announce
-%%PORTDOCS%%share/doc/samba/faq/README
-%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-1.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-2.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ.sgml
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-1.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-2.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-3.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-4.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-5.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-6.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ.sgml
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ.txt
-%%PORTDOCS%%share/doc/samba/faq/sambafaq-1.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq-2.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq-3.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq-4.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq-5.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq.sgml
-%%PORTDOCS%%share/doc/samba/faq/sambafaq.txt
 %%PORTDOCS%%share/doc/samba/history
-%%PORTDOCS%%share/doc/samba/htmldocs/Browsing.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Bugs.html
-%%PORTDOCS%%share/doc/samba/htmldocs/CVS-Access.html
-%%PORTDOCS%%share/doc/samba/htmldocs/DOMAIN_MEMBER.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Diagnosis.html
-%%PORTDOCS%%share/doc/samba/htmldocs/ENCRYPTION.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Integrating-with-Windows.html
-%%PORTDOCS%%share/doc/samba/htmldocs/NT_Security.html
-%%PORTDOCS%%share/doc/samba/htmldocs/OS2-Client-HOWTO.html
-%%PORTDOCS%%share/doc/samba/htmldocs/PAM-Authentication-And-Samba.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Printing.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-BDC-HOWTO.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-PDC-HOWTO.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-LDAP-HOWTO.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Speed.html
-%%PORTDOCS%%share/doc/samba/htmldocs/security_level.html
-%%PORTDOCS%%share/doc/samba/htmldocs/UNIX_INSTALL.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Samba-Developers-Guide.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ads.html
+%%PORTDOCS%%share/doc/samba/htmldocs/appendixes.html
+%%PORTDOCS%%share/doc/samba/htmldocs/browsing-quick.html
+%%PORTDOCS%%share/doc/samba/htmldocs/bugreport.html
+%%PORTDOCS%%share/doc/samba/htmldocs/cvs-access.html
+%%PORTDOCS%%share/doc/samba/htmldocs/diagnosis.html
+%%PORTDOCS%%share/doc/samba/htmldocs/domain-security.html
 %%PORTDOCS%%share/doc/samba/htmldocs/findsmb.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/groupmapping.html
+%%PORTDOCS%%share/doc/samba/htmldocs/improved-browsing.html
+%%PORTDOCS%%share/doc/samba/htmldocs/install.html
+%%PORTDOCS%%share/doc/samba/htmldocs/integrate-ms-networks.html
+%%PORTDOCS%%share/doc/samba/htmldocs/introduction.html
 %%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html
-%%PORTDOCS%%share/doc/samba/htmldocs/make_smbcodepage.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/make_unicodemap.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/msdfs_setup.html
+%%PORTDOCS%%share/doc/samba/htmldocs/msdfs.html
 %%PORTDOCS%%share/doc/samba/htmldocs/net.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmbd.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmblookup.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/oplocks.html
+%%PORTDOCS%%share/doc/samba/htmldocs/optional.html
+%%PORTDOCS%%share/doc/samba/htmldocs/other-clients.html
+%%PORTDOCS%%share/doc/samba/htmldocs/p1346.html
+%%PORTDOCS%%share/doc/samba/htmldocs/p18.html
+%%PORTDOCS%%share/doc/samba/htmldocs/p3106.html
+%%PORTDOCS%%share/doc/samba/htmldocs/p544.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pam.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pdb-mysql.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pdb-xml.html
 %%PORTDOCS%%share/doc/samba/htmldocs/pdbedit.8.html
-%%PORTDOCS%%share/doc/samba/htmldocs/printer_driver2.html
+%%PORTDOCS%%share/doc/samba/htmldocs/portability.html
+%%PORTDOCS%%share/doc/samba/htmldocs/printing.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pwencrypt.html
 %%PORTDOCS%%share/doc/samba/htmldocs/rpcclient.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/samba.7.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-bdc.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-howto-collection.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-ldap-howto.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-pdc.html
+%%PORTDOCS%%share/doc/samba/htmldocs/securitylevels.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smb.conf.5.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbcacls.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbclient.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbcontrol.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbd.8.html
-%%PORTDOCS%%share/doc/samba/htmldocs/smbgroupedit.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmnt.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmount.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbpasswd.5.html
@@ -107,41 +108,31 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/smbstatus.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbtar.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbumount.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/speed.html
 %%PORTDOCS%%share/doc/samba/htmldocs/swat.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testparm.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testprns.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/type.html
+%%PORTDOCS%%share/doc/samba/htmldocs/unix-permissions.html
+%%PORTDOCS%%share/doc/samba/htmldocs/vfs.html
+%%PORTDOCS%%share/doc/samba/htmldocs/vfstest.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/wbinfo.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/wfw_slip.htm
 %%PORTDOCS%%share/doc/samba/htmldocs/winbind.html
 %%PORTDOCS%%share/doc/samba/htmldocs/winbindd.8.html
-%%PORTDOCS%%share/doc/samba/textdocs/ADS-HOWTO.txt
-%%PORTDOCS%%share/doc/samba/textdocs/Application_Serving.txt
-%%PORTDOCS%%share/doc/samba/textdocs/BROWSING-Config.txt
-%%PORTDOCS%%share/doc/samba/textdocs/DHCP-Server-Configuration.txt
-%%PORTDOCS%%share/doc/samba/textdocs/Faxing.txt
-%%PORTDOCS%%share/doc/samba/textdocs/GOTCHAS.txt
-%%PORTDOCS%%share/doc/samba/textdocs/HINTS.txt
-%%PORTDOCS%%share/doc/samba/textdocs/PROFILES.txt
-%%PORTDOCS%%share/doc/samba/textdocs/README.DCEDFS
 %%PORTDOCS%%share/doc/samba/textdocs/README.NOW
 %%PORTDOCS%%share/doc/samba/textdocs/README.jis
-%%PORTDOCS%%share/doc/samba/textdocs/Recent-FAQs.txt
-%%PORTDOCS%%share/doc/samba/textdocs/RoutedNetworks.txt
-%%PORTDOCS%%share/doc/samba/textdocs/UNIX_SECURITY.txt
 share/examples/samba/README
 share/examples/samba/VFS/.cvsignore
-share/examples/samba/VFS/Makefile
 share/examples/samba/VFS/Makefile.in
 share/examples/samba/VFS/README
-share/examples/samba/VFS/README.netatalk
-share/examples/samba/VFS/audit.c
-share/examples/samba/VFS/netatalk.c
-share/examples/samba/VFS/skel.c
-share/examples/samba/VFS/recycle.c
+share/examples/samba/VFS/autogen.sh
+share/examples/samba/VFS/configure.in
+share/examples/samba/VFS/install-sh
+share/examples/samba/VFS/skel_opaque.c
+share/examples/samba/VFS/skel_transparent.c
 share/examples/samba/LDAP/README
-share/examples/samba/LDAP/export2_smbpasswd.pl
+share/examples/samba/LDAP/convertSambaAccount
 share/examples/samba/LDAP/export_smbpasswd.pl
-share/examples/samba/LDAP/import2_smbpasswd.pl
 share/examples/samba/LDAP/import_smbpasswd.pl
 share/examples/samba/LDAP/ldapchpasswd
 share/examples/samba/LDAP/ldapsync.pl
@@ -154,9 +145,12 @@ share/examples/samba/appliance/README
 share/examples/samba/appliance/appliance.spec
 share/examples/samba/appliance/build.sh
 share/examples/samba/appliance/smb.conf-appliance
+share/examples/samba/auth/Makefile
+share/examples/samba/auth/auth_skel.c
 share/examples/samba/autofs/auto.a
 share/examples/samba/dce-dfs/README
 share/examples/samba/dce-dfs/smb.conf
+share/examples/samba/genlogon/genlogon.pl
 share/examples/samba/libsmbclient/Makefile
 share/examples/samba/libsmbclient/README
 share/examples/samba/libsmbclient/testsmbc.c
@@ -165,17 +159,11 @@ share/examples/samba/misc/extra_smbstatus
 share/examples/samba/misc/modify_samba_config.pl
 share/examples/samba/misc/swat.pl
 share/examples/samba/misc/wall.perl
-share/examples/samba/pdb/mysql/ChangeLog
-share/examples/samba/pdb/mysql/Makefile
-share/examples/samba/pdb/mysql/Makefile.in
-share/examples/samba/pdb/mysql/README
-share/examples/samba/pdb/mysql/pdb_mysql.c
-share/examples/samba/pdb/xml/ChangeLog
-share/examples/samba/pdb/xml/Makefile
-share/examples/samba/pdb/xml/Makefile.in
-share/examples/samba/pdb/xml/README
-share/examples/samba/pdb/xml/TODO
-share/examples/samba/pdb/xml/pdb_xml.c
+share/examples/samba/ntlogon/README
+share/examples/samba/ntlogon/ntlogon.conf
+share/examples/samba/ntlogon/ntlogon.py
+share/examples/samba/pdb/mysql/mysql.dump
+share/examples/samba/pdb/mysql/smb.conf
 share/examples/samba/pdb/Makefile
 share/examples/samba/pdb/README
 share/examples/samba/pdb/pdb_test.c
@@ -185,16 +173,13 @@ share/examples/samba/printer-accounting/acct-sum
 share/examples/samba/printer-accounting/hp5-redir
 share/examples/samba/printer-accounting/lp-acct
 share/examples/samba/printer-accounting/printcap
+share/examples/samba/printing/prtpub.c
+share/examples/samba/printing/readme.prtpub
 share/examples/samba/printing/smbprint
-share/examples/samba/printing/smbprint.old
 share/examples/samba/printing/smbprint-new.sh
 share/examples/samba/printing/smbprint.sysv
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
-share/examples/samba/sam/Makefile
-share/examples/samba/sam/Makefile.in
-share/examples/samba/sam/README
-share/examples/samba/sam/sam_skel.c
 share/examples/samba/smb.conf.default
 share/examples/samba/svr4-startup/README
 share/examples/samba/svr4-startup/samba.server
@@ -210,42 +195,51 @@ share/examples/samba/validchars/nwdos70.out
 share/examples/samba/validchars/readme
 share/examples/samba/validchars/validchr.c
 share/examples/samba/validchars/validchr.com
-share/swat/help/Browsing.html
-share/swat/help/Bugs.html
-share/swat/help/CVS-Access.html
-share/swat/help/DOMAIN_MEMBER.html
-share/swat/help/Diagnosis.html
-share/swat/help/ENCRYPTION.html
-share/swat/help/Integrating-with-Windows.html
-share/swat/help/NT_Security.html
-share/swat/help/OS2-Client-HOWTO.html
-share/swat/help/PAM-Authentication-And-Samba.html
-share/swat/help/Printing.html
-share/swat/help/Samba-HOWTO-Collection.html
-share/swat/help/Samba-BDC-HOWTO.html
-share/swat/help/Samba-PDC-HOWTO.html
-share/swat/help/Speed.html
-share/swat/help/security_level.html
-share/swat/help/UNIX_INSTALL.html
+share/swat/help/Samba-Developers-Guide.html
+share/swat/help/ads.html
+share/swat/help/appendixes.html
+share/swat/help/browsing-quick.html
+share/swat/help/bugreport.html
+share/swat/help/cvs-access.html
+share/swat/help/diagnosis.html
+share/swat/help/domain-security.html
 share/swat/help/findsmb.1.html
+share/swat/help/groupmapping.html
+share/swat/help/improved-browsing.html
+share/swat/help/install.html
+share/swat/help/integrate-ms-networks.html
+share/swat/help/introduction.html
 share/swat/help/lmhosts.5.html
-share/swat/help/make_smbcodepage.1.html
-share/swat/help/make_unicodemap.1.html
-share/swat/help/msdfs_setup.html
+share/swat/help/msdfs.html
 share/swat/help/net.8.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
+share/swat/help/oplocks.html
+share/swat/help/optional.html
+share/swat/help/other-clients.html
+share/swat/help/p1346.html
+share/swat/help/p18.html
+share/swat/help/p3106.html
+share/swat/help/p544.html
+share/swat/help/pam.html
 share/swat/help/pdbedit.8.html
-share/swat/help/printer_driver2.html
+share/swat/help/pdb-mysql.html
+share/swat/help/pdb-xml.html
+share/swat/help/portability.html
+share/swat/help/printing.html
+share/swat/help/pwencrypt.html
 share/swat/help/rpcclient.1.html
-share/swat/help/Samba-LDAP-HOWTO.html
 share/swat/help/samba.7.html
+share/swat/help/samba-bdc.html
+share/swat/help/samba-howto-collection.html
+share/swat/help/samba-ldap-howto.html
+share/swat/help/samba-pdc.html
+share/swat/help/securitylevels.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/smbgroupedit.8.html
 share/swat/help/smbmnt.8.html
 share/swat/help/smbmount.8.html
 share/swat/help/smbpasswd.5.html
@@ -255,9 +249,14 @@ share/swat/help/smbspool.8.html
 share/swat/help/smbstatus.1.html
 share/swat/help/smbtar.1.html
 share/swat/help/smbumount.8.html
+share/swat/help/speed.html
 share/swat/help/swat.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
+share/swat/help/type.html
+share/swat/help/unix-permissions.html
+share/swat/help/vfs.html
+share/swat/help/vfstest.1.html
 share/swat/help/wbinfo.1.html
 share/swat/help/welcome.html
 share/swat/help/winbind.html
@@ -479,14 +478,15 @@ share/swat/using_samba/this_edition.html
 @dirrm share/examples/samba/simple
 @dirrm share/examples/samba/printing
 @dirrm share/examples/samba/pdb/mysql
-@dirrm share/examples/samba/pdb/xml
 @dirrm share/examples/samba/pdb
 @dirrm share/examples/samba/printer-accounting
-@dirrm share/examples/samba/sam
+@dirrm share/examples/samba/ntlogon
 @dirrm share/examples/samba/misc
 @dirrm share/examples/samba/libsmbclient
+@dirrm share/examples/samba/genlogon
 @dirrm share/examples/samba/dce-dfs
 @dirrm share/examples/samba/autofs
+@dirrm share/examples/samba/auth
 @dirrm share/examples/samba/appliance
 @dirrm share/examples/samba/VFS
 @dirrm share/examples/samba
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 46a2e26e2b5c..a1575cedef1b 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0a20
+PORTVERSION=	3.0.0.b1
+PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://us4.samba.org/samba/ftp/%SUBDIR%/
-MASTER_SITE_SUBDIR=	alpha old
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/a/alpha/}
+MASTER_SITE_SUBDIR=	beta alpha old
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
 
 MAINTAINER=	dwcjr@FreeBSD.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
@@ -27,7 +28,6 @@ CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
 .endif
 
-
 # directories
 VARDIR=		/var
 SAMBA_SPOOL=	${VARDIR}/spool/samba
@@ -41,6 +41,7 @@ DOCSDIR=	${PREFIX}/share/doc/samba
 
 NO_LATEST_LINK=	yes
 USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER=	253
 CONFIGURE_ARGS=	--libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
@@ -91,12 +92,12 @@ CONFIGURE_ARGS+=	--with-libiconv
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		findsmb.1 make_smbcodepage.1 make_unicodemap.1 nmblookup.1 \
+MAN1=		findsmb.1 nmblookup.1 \
 		rpcclient.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
-		smbstatus.1 smbtar.1 testparm.1 testprns.1 wbinfo.1
+		smbstatus.1 smbtar.1 testparm.1 testprns.1 wbinfo.1 vfstest.1
 MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7
-MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 \
+MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 net.8 pdbedit.8 \
 		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8
 
 post-install:
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index a081eab1d7a7..374fb4850cff 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-3.0alpha20.tar.bz2) = 2fe6a786d717998871889ba8d72ec521
+MD5 (samba-3.0.0beta1.tar.bz2) = e212b1828fe9f4784059b494a5782c95
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 9f0d17b143b9..7223166b96ee 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -1,30 +1,42 @@
-bin/addtosmbpass
-bin/convert_smbpasswd
+bin/editreg
+bin/findsmb
 bin/make_smbpasswd
+bin/net
 bin/nmblookup
+bin/ntlm_auth
 bin/pdbedit
+bin/profiles
 bin/rpcclient
 bin/smbcacls
 bin/smbclient
 bin/smbcontrol
-bin/smbgroupedit
+bin/smbcquotas
 bin/smbpasswd
 bin/smbspool
 bin/smbstatus
 bin/smbtar
 bin/smbtree
+bin/tdbbackup
 bin/testparm
 bin/testprns
 etc/rc.d/samba.sh.sample
+etc/lowcase.dat
 etc/smb.conf.default
+etc/upcase.dat
+etc/valid.dat
 sbin/nmbd
 sbin/smbd
 sbin/swat
+%%PORTDOCS%%share/doc/samba/faq/clientapp.html
+%%PORTDOCS%%share/doc/samba/faq/errors.html
+%%PORTDOCS%%share/doc/samba/faq/general.html
+%%PORTDOCS%%share/doc/samba/faq/install.html
+%%PORTDOCS%%share/doc/samba/faq/samba-faq.html
 %%PORTDOCS%%share/doc/samba/COPYING
 %%PORTDOCS%%share/doc/samba/Manifest
-%%PORTDOCS%%share/doc/samba/README
 %%PORTDOCS%%share/doc/samba/README.FreeBSD
 %%PORTDOCS%%share/doc/samba/README.swat
+%%PORTDOCS%%share/doc/samba/README
 %%PORTDOCS%%share/doc/samba/Read-Manifest-Now
 %%PORTDOCS%%share/doc/samba/Registry/NT4-Locking.reg
 %%PORTDOCS%%share/doc/samba/Registry/NT4_PlainPassword.reg
@@ -34,70 +46,59 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/Registry/Win9X-CacheHandling.reg
 %%PORTDOCS%%share/doc/samba/Registry/WinME_PlainPassword.reg
 %%PORTDOCS%%share/doc/samba/Registry/WinXP_SignOrSeal.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win-NT-2K-XP-DeleteRoamingProfile.reg
+%%PORTDOCS%%share/doc/samba/Registry/WinXP_PlainPassword.reg
 %%PORTDOCS%%share/doc/samba/Registry/WindowsTerminalServer.reg
 %%PORTDOCS%%share/doc/samba/Roadmap
 %%PORTDOCS%%share/doc/samba/THANKS
 %%PORTDOCS%%share/doc/samba/WHATSNEW.txt
 %%PORTDOCS%%share/doc/samba/announce
-%%PORTDOCS%%share/doc/samba/faq/README
-%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-1.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-2.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ.sgml
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-1.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-2.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-3.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-4.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-5.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ-6.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ.html
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ.sgml
-%%PORTDOCS%%share/doc/samba/faq/Samba-meta-FAQ.txt
-%%PORTDOCS%%share/doc/samba/faq/sambafaq-1.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq-2.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq-3.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq-4.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq-5.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq.html
-%%PORTDOCS%%share/doc/samba/faq/sambafaq.sgml
-%%PORTDOCS%%share/doc/samba/faq/sambafaq.txt
 %%PORTDOCS%%share/doc/samba/history
-%%PORTDOCS%%share/doc/samba/htmldocs/Browsing.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Bugs.html
-%%PORTDOCS%%share/doc/samba/htmldocs/CVS-Access.html
-%%PORTDOCS%%share/doc/samba/htmldocs/DOMAIN_MEMBER.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Diagnosis.html
-%%PORTDOCS%%share/doc/samba/htmldocs/ENCRYPTION.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Integrating-with-Windows.html
-%%PORTDOCS%%share/doc/samba/htmldocs/NT_Security.html
-%%PORTDOCS%%share/doc/samba/htmldocs/OS2-Client-HOWTO.html
-%%PORTDOCS%%share/doc/samba/htmldocs/PAM-Authentication-And-Samba.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Printing.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-BDC-HOWTO.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-PDC-HOWTO.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-LDAP-HOWTO.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Speed.html
-%%PORTDOCS%%share/doc/samba/htmldocs/security_level.html
-%%PORTDOCS%%share/doc/samba/htmldocs/UNIX_INSTALL.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Samba-Developers-Guide.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ads.html
+%%PORTDOCS%%share/doc/samba/htmldocs/appendixes.html
+%%PORTDOCS%%share/doc/samba/htmldocs/browsing-quick.html
+%%PORTDOCS%%share/doc/samba/htmldocs/bugreport.html
+%%PORTDOCS%%share/doc/samba/htmldocs/cvs-access.html
+%%PORTDOCS%%share/doc/samba/htmldocs/diagnosis.html
+%%PORTDOCS%%share/doc/samba/htmldocs/domain-security.html
 %%PORTDOCS%%share/doc/samba/htmldocs/findsmb.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/groupmapping.html
+%%PORTDOCS%%share/doc/samba/htmldocs/improved-browsing.html
+%%PORTDOCS%%share/doc/samba/htmldocs/install.html
+%%PORTDOCS%%share/doc/samba/htmldocs/integrate-ms-networks.html
+%%PORTDOCS%%share/doc/samba/htmldocs/introduction.html
 %%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html
-%%PORTDOCS%%share/doc/samba/htmldocs/make_smbcodepage.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/make_unicodemap.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/msdfs_setup.html
+%%PORTDOCS%%share/doc/samba/htmldocs/msdfs.html
 %%PORTDOCS%%share/doc/samba/htmldocs/net.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmbd.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmblookup.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/oplocks.html
+%%PORTDOCS%%share/doc/samba/htmldocs/optional.html
+%%PORTDOCS%%share/doc/samba/htmldocs/other-clients.html
+%%PORTDOCS%%share/doc/samba/htmldocs/p1346.html
+%%PORTDOCS%%share/doc/samba/htmldocs/p18.html
+%%PORTDOCS%%share/doc/samba/htmldocs/p3106.html
+%%PORTDOCS%%share/doc/samba/htmldocs/p544.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pam.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pdb-mysql.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pdb-xml.html
 %%PORTDOCS%%share/doc/samba/htmldocs/pdbedit.8.html
-%%PORTDOCS%%share/doc/samba/htmldocs/printer_driver2.html
+%%PORTDOCS%%share/doc/samba/htmldocs/portability.html
+%%PORTDOCS%%share/doc/samba/htmldocs/printing.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pwencrypt.html
 %%PORTDOCS%%share/doc/samba/htmldocs/rpcclient.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/samba.7.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-bdc.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-howto-collection.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-ldap-howto.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba-pdc.html
+%%PORTDOCS%%share/doc/samba/htmldocs/securitylevels.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smb.conf.5.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbcacls.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbclient.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbcontrol.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbd.8.html
-%%PORTDOCS%%share/doc/samba/htmldocs/smbgroupedit.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmnt.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmount.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbpasswd.5.html
@@ -107,41 +108,31 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/smbstatus.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbtar.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbumount.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/speed.html
 %%PORTDOCS%%share/doc/samba/htmldocs/swat.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testparm.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testprns.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/type.html
+%%PORTDOCS%%share/doc/samba/htmldocs/unix-permissions.html
+%%PORTDOCS%%share/doc/samba/htmldocs/vfs.html
+%%PORTDOCS%%share/doc/samba/htmldocs/vfstest.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/wbinfo.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/wfw_slip.htm
 %%PORTDOCS%%share/doc/samba/htmldocs/winbind.html
 %%PORTDOCS%%share/doc/samba/htmldocs/winbindd.8.html
-%%PORTDOCS%%share/doc/samba/textdocs/ADS-HOWTO.txt
-%%PORTDOCS%%share/doc/samba/textdocs/Application_Serving.txt
-%%PORTDOCS%%share/doc/samba/textdocs/BROWSING-Config.txt
-%%PORTDOCS%%share/doc/samba/textdocs/DHCP-Server-Configuration.txt
-%%PORTDOCS%%share/doc/samba/textdocs/Faxing.txt
-%%PORTDOCS%%share/doc/samba/textdocs/GOTCHAS.txt
-%%PORTDOCS%%share/doc/samba/textdocs/HINTS.txt
-%%PORTDOCS%%share/doc/samba/textdocs/PROFILES.txt
-%%PORTDOCS%%share/doc/samba/textdocs/README.DCEDFS
 %%PORTDOCS%%share/doc/samba/textdocs/README.NOW
 %%PORTDOCS%%share/doc/samba/textdocs/README.jis
-%%PORTDOCS%%share/doc/samba/textdocs/Recent-FAQs.txt
-%%PORTDOCS%%share/doc/samba/textdocs/RoutedNetworks.txt
-%%PORTDOCS%%share/doc/samba/textdocs/UNIX_SECURITY.txt
 share/examples/samba/README
 share/examples/samba/VFS/.cvsignore
-share/examples/samba/VFS/Makefile
 share/examples/samba/VFS/Makefile.in
 share/examples/samba/VFS/README
-share/examples/samba/VFS/README.netatalk
-share/examples/samba/VFS/audit.c
-share/examples/samba/VFS/netatalk.c
-share/examples/samba/VFS/skel.c
-share/examples/samba/VFS/recycle.c
+share/examples/samba/VFS/autogen.sh
+share/examples/samba/VFS/configure.in
+share/examples/samba/VFS/install-sh
+share/examples/samba/VFS/skel_opaque.c
+share/examples/samba/VFS/skel_transparent.c
 share/examples/samba/LDAP/README
-share/examples/samba/LDAP/export2_smbpasswd.pl
+share/examples/samba/LDAP/convertSambaAccount
 share/examples/samba/LDAP/export_smbpasswd.pl
-share/examples/samba/LDAP/import2_smbpasswd.pl
 share/examples/samba/LDAP/import_smbpasswd.pl
 share/examples/samba/LDAP/ldapchpasswd
 share/examples/samba/LDAP/ldapsync.pl
@@ -154,9 +145,12 @@ share/examples/samba/appliance/README
 share/examples/samba/appliance/appliance.spec
 share/examples/samba/appliance/build.sh
 share/examples/samba/appliance/smb.conf-appliance
+share/examples/samba/auth/Makefile
+share/examples/samba/auth/auth_skel.c
 share/examples/samba/autofs/auto.a
 share/examples/samba/dce-dfs/README
 share/examples/samba/dce-dfs/smb.conf
+share/examples/samba/genlogon/genlogon.pl
 share/examples/samba/libsmbclient/Makefile
 share/examples/samba/libsmbclient/README
 share/examples/samba/libsmbclient/testsmbc.c
@@ -165,17 +159,11 @@ share/examples/samba/misc/extra_smbstatus
 share/examples/samba/misc/modify_samba_config.pl
 share/examples/samba/misc/swat.pl
 share/examples/samba/misc/wall.perl
-share/examples/samba/pdb/mysql/ChangeLog
-share/examples/samba/pdb/mysql/Makefile
-share/examples/samba/pdb/mysql/Makefile.in
-share/examples/samba/pdb/mysql/README
-share/examples/samba/pdb/mysql/pdb_mysql.c
-share/examples/samba/pdb/xml/ChangeLog
-share/examples/samba/pdb/xml/Makefile
-share/examples/samba/pdb/xml/Makefile.in
-share/examples/samba/pdb/xml/README
-share/examples/samba/pdb/xml/TODO
-share/examples/samba/pdb/xml/pdb_xml.c
+share/examples/samba/ntlogon/README
+share/examples/samba/ntlogon/ntlogon.conf
+share/examples/samba/ntlogon/ntlogon.py
+share/examples/samba/pdb/mysql/mysql.dump
+share/examples/samba/pdb/mysql/smb.conf
 share/examples/samba/pdb/Makefile
 share/examples/samba/pdb/README
 share/examples/samba/pdb/pdb_test.c
@@ -185,16 +173,13 @@ share/examples/samba/printer-accounting/acct-sum
 share/examples/samba/printer-accounting/hp5-redir
 share/examples/samba/printer-accounting/lp-acct
 share/examples/samba/printer-accounting/printcap
+share/examples/samba/printing/prtpub.c
+share/examples/samba/printing/readme.prtpub
 share/examples/samba/printing/smbprint
-share/examples/samba/printing/smbprint.old
 share/examples/samba/printing/smbprint-new.sh
 share/examples/samba/printing/smbprint.sysv
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
-share/examples/samba/sam/Makefile
-share/examples/samba/sam/Makefile.in
-share/examples/samba/sam/README
-share/examples/samba/sam/sam_skel.c
 share/examples/samba/smb.conf.default
 share/examples/samba/svr4-startup/README
 share/examples/samba/svr4-startup/samba.server
@@ -210,42 +195,51 @@ share/examples/samba/validchars/nwdos70.out
 share/examples/samba/validchars/readme
 share/examples/samba/validchars/validchr.c
 share/examples/samba/validchars/validchr.com
-share/swat/help/Browsing.html
-share/swat/help/Bugs.html
-share/swat/help/CVS-Access.html
-share/swat/help/DOMAIN_MEMBER.html
-share/swat/help/Diagnosis.html
-share/swat/help/ENCRYPTION.html
-share/swat/help/Integrating-with-Windows.html
-share/swat/help/NT_Security.html
-share/swat/help/OS2-Client-HOWTO.html
-share/swat/help/PAM-Authentication-And-Samba.html
-share/swat/help/Printing.html
-share/swat/help/Samba-HOWTO-Collection.html
-share/swat/help/Samba-BDC-HOWTO.html
-share/swat/help/Samba-PDC-HOWTO.html
-share/swat/help/Speed.html
-share/swat/help/security_level.html
-share/swat/help/UNIX_INSTALL.html
+share/swat/help/Samba-Developers-Guide.html
+share/swat/help/ads.html
+share/swat/help/appendixes.html
+share/swat/help/browsing-quick.html
+share/swat/help/bugreport.html
+share/swat/help/cvs-access.html
+share/swat/help/diagnosis.html
+share/swat/help/domain-security.html
 share/swat/help/findsmb.1.html
+share/swat/help/groupmapping.html
+share/swat/help/improved-browsing.html
+share/swat/help/install.html
+share/swat/help/integrate-ms-networks.html
+share/swat/help/introduction.html
 share/swat/help/lmhosts.5.html
-share/swat/help/make_smbcodepage.1.html
-share/swat/help/make_unicodemap.1.html
-share/swat/help/msdfs_setup.html
+share/swat/help/msdfs.html
 share/swat/help/net.8.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
+share/swat/help/oplocks.html
+share/swat/help/optional.html
+share/swat/help/other-clients.html
+share/swat/help/p1346.html
+share/swat/help/p18.html
+share/swat/help/p3106.html
+share/swat/help/p544.html
+share/swat/help/pam.html
 share/swat/help/pdbedit.8.html
-share/swat/help/printer_driver2.html
+share/swat/help/pdb-mysql.html
+share/swat/help/pdb-xml.html
+share/swat/help/portability.html
+share/swat/help/printing.html
+share/swat/help/pwencrypt.html
 share/swat/help/rpcclient.1.html
-share/swat/help/Samba-LDAP-HOWTO.html
 share/swat/help/samba.7.html
+share/swat/help/samba-bdc.html
+share/swat/help/samba-howto-collection.html
+share/swat/help/samba-ldap-howto.html
+share/swat/help/samba-pdc.html
+share/swat/help/securitylevels.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/smbgroupedit.8.html
 share/swat/help/smbmnt.8.html
 share/swat/help/smbmount.8.html
 share/swat/help/smbpasswd.5.html
@@ -255,9 +249,14 @@ share/swat/help/smbspool.8.html
 share/swat/help/smbstatus.1.html
 share/swat/help/smbtar.1.html
 share/swat/help/smbumount.8.html
+share/swat/help/speed.html
 share/swat/help/swat.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
+share/swat/help/type.html
+share/swat/help/unix-permissions.html
+share/swat/help/vfs.html
+share/swat/help/vfstest.1.html
 share/swat/help/wbinfo.1.html
 share/swat/help/welcome.html
 share/swat/help/winbind.html
@@ -479,14 +478,15 @@ share/swat/using_samba/this_edition.html
 @dirrm share/examples/samba/simple
 @dirrm share/examples/samba/printing
 @dirrm share/examples/samba/pdb/mysql
-@dirrm share/examples/samba/pdb/xml
 @dirrm share/examples/samba/pdb
 @dirrm share/examples/samba/printer-accounting
-@dirrm share/examples/samba/sam
+@dirrm share/examples/samba/ntlogon
 @dirrm share/examples/samba/misc
 @dirrm share/examples/samba/libsmbclient
+@dirrm share/examples/samba/genlogon
 @dirrm share/examples/samba/dce-dfs
 @dirrm share/examples/samba/autofs
+@dirrm share/examples/samba/auth
 @dirrm share/examples/samba/appliance
 @dirrm share/examples/samba/VFS
 @dirrm share/examples/samba