Upgrade to 3.0.0.

Submitted by:	maintainer

6 files changed, 478 insertions, 352 deletions

diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 40bc42c5e50c..c8b6c08bb753 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0.0.b3
+PORTVERSION=	3.0.0
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	http://us4.samba.org/samba/ftp/%SUBDIR%/archives/
-MASTER_SITE_SUBDIR=	beta alpha old
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
+MASTER_SITES=	http://us3.samba.org/samba/ftp/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. rc
+#DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	dwcjr@FreeBSD.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
@@ -92,13 +92,13 @@ CONFIGURE_ARGS+=	--with-libiconv
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		findsmb.1 nmblookup.1 \
+MAN1=		findsmb.1 nmblookup.1 log2pcap.1 \
 		rpcclient.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
 		smbstatus.1 smbtar.1 testparm.1 testprns.1 wbinfo.1 vfstest.1 \
 		editreg.1 ntlm_auth.1 profiles.1 smbcquotas.1 smbtree.1
 MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7 Samba.7
-MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 net.8 pdbedit.8 \
+MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 net.8 pdbedit.8 mount.cifs.8 \
 		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8 tdbbackup.8
 
 post-install:
@@ -150,7 +150,7 @@ post-install:
 			${WRKDIR}/${DISTNAME}/docs/history ; do		\
 		${INSTALL_DATA} $$i ${DOCSDIR} ;		\
 	done
-	for i in faq htmldocs textdocs Registry ; do			\
+	for i in faq htmldocs Registry ; do			\
 		${MKDIR} ${DOCSDIR}/$$i ;		\
 		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
 			if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
@@ -160,7 +160,6 @@ post-install:
 			fi; \
 		done							\
 	done
-	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${DOCSDIR}/README.swat
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/samba-devel/distinfo b/net/samba-devel/distinfo
index ad7f031a84d0..525e7a4cd22d 100644
--- a/net/samba-devel/distinfo
+++ b/net/samba-devel/distinfo
@@ -1 +1 @@
-MD5 (samba-3.0.0beta3.tar.bz2) = a5455bfd675a3e6a75dfed468ae22305
+MD5 (samba-3.0.0.tar.bz2) = f54ba49f9a5ef6090272acf8db2e066d
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
index 00a30098bc0b..2346307dcb40 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -18,19 +18,35 @@ bin/smbtree
 bin/tdbbackup
 bin/testparm
 bin/testprns
-etc/rc.d/samba.sh.sample
+bin/wbinfo
+etc/charset/CP437.so
+etc/charset/CP850.so
+etc/de.msg
+etc/en.msg
+etc/fr.msg
+etc/it.msg
+etc/ja.msg
 etc/lowcase.dat
+etc/pl.msg
+etc/rc.d/samba.sh.sample
 etc/smb.conf.default
+etc/tr.msg
 etc/upcase.dat
 etc/valid.dat
 etc/vfs/audit.so
+etc/vfs/cap.so
+etc/vfs/default_quota.so
 etc/vfs/extd_audit.so
 etc/vfs/fake_perms.so
 etc/vfs/netatalk.so
+etc/vfs/readonly.so
 etc/vfs/recycle.so
+include/libsmbclient.h
+lib/libsmbclient.so
 sbin/nmbd
 sbin/smbd
 sbin/swat
+sbin/winbindd
 %%PORTDOCS%%share/doc/samba/faq/FAQ-ClientApp.html
 %%PORTDOCS%%share/doc/samba/faq/FAQ-Install.html
 %%PORTDOCS%%share/doc/samba/faq/FAQ-errors.html
@@ -40,7 +56,6 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/COPYING
 %%PORTDOCS%%share/doc/samba/Manifest
 %%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
@@ -94,8 +109,10 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/integrate-ms-networks.html
 %%PORTDOCS%%share/doc/samba/htmldocs/introduction.html
 %%PORTDOCS%%share/doc/samba/htmldocs/locking.html
+%%PORTDOCS%%share/doc/samba/htmldocs/log2pcap.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html
 %%PORTDOCS%%share/doc/samba/htmldocs/migration.html
+%%PORTDOCS%%share/doc/samba/htmldocs/mount.cifs.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/msdfs.html
 %%PORTDOCS%%share/doc/samba/htmldocs/net.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmbd.8.html
@@ -105,6 +122,8 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/pam.html
 %%PORTDOCS%%share/doc/samba/htmldocs/passdb.html
 %%PORTDOCS%%share/doc/samba/htmldocs/pdbedit.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pr01.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pr02.html
 %%PORTDOCS%%share/doc/samba/htmldocs/printing.html
 %%PORTDOCS%%share/doc/samba/htmldocs/problems.html
 %%PORTDOCS%%share/doc/samba/htmldocs/profiles.1.html
@@ -112,6 +131,7 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/samba.7.html
 %%PORTDOCS%%share/doc/samba/htmldocs/samba-bdc.html
 %%PORTDOCS%%share/doc/samba/htmldocs/samba-pdc.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba.css
 %%PORTDOCS%%share/doc/samba/htmldocs/securing-samba.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smb.conf.5.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbcacls.1.html
@@ -143,8 +163,6 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/wbinfo.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/winbind.html
 %%PORTDOCS%%share/doc/samba/htmldocs/winbindd.8.html
-%%PORTDOCS%%share/doc/samba/textdocs/README.NOW
-%%PORTDOCS%%share/doc/samba/textdocs/README.jis
 share/examples/samba/README
 share/examples/samba/VFS/.cvsignore
 share/examples/samba/VFS/Makefile.in
@@ -152,15 +170,49 @@ share/examples/samba/VFS/README
 share/examples/samba/VFS/autogen.sh
 share/examples/samba/VFS/configure.in
 share/examples/samba/VFS/install-sh
+share/examples/samba/VFS/shadow_copy_test.c
 share/examples/samba/VFS/skel_opaque.c
 share/examples/samba/VFS/skel_transparent.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/md4.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.h
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/Makefile
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.h
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/smbdes.c
+share/examples/samba/LDAP/smbldap-tools/cgi/ldappass.cgi
+share/examples/samba/LDAP/smbldap-tools/cgi/README
+share/examples/samba/LDAP/smbldap-tools/ChangeLog
+share/examples/samba/LDAP/smbldap-tools/COPYING
+share/examples/samba/LDAP/smbldap-tools/Makefile
+share/examples/samba/LDAP/smbldap-tools/FILES
+share/examples/samba/LDAP/smbldap-tools/INSTALL
+share/examples/samba/LDAP/smbldap-tools/INFRASTRUCTURE
+share/examples/samba/LDAP/smbldap-tools/README
+share/examples/samba/LDAP/smbldap-tools/TODO
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupadd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupdel.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupmod.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupshow.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-accounts.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-groups.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-passwd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-populate.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-tools.spec
+share/examples/samba/LDAP/smbldap-tools/smbldap-useradd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-userdel.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-usermod.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-usershow.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap_conf.pm
+share/examples/samba/LDAP/smbldap-tools/CONTRIBUTORS
+share/examples/samba/LDAP/smbldap-tools/smbldap_tools.pm
 share/examples/samba/LDAP/README
 share/examples/samba/LDAP/convertSambaAccount
-share/examples/samba/LDAP/export_smbpasswd.pl
-share/examples/samba/LDAP/import_smbpasswd.pl
-share/examples/samba/LDAP/ldapchpasswd
 share/examples/samba/LDAP/ldapsync.pl
 share/examples/samba/LDAP/samba.schema
+share/examples/samba/LDAP/samba.schema.at.IBM-DS
+share/examples/samba/LDAP/samba.schema.oc.IBM-DS
+share/examples/samba/LDAP/samba-nds.schema
 share/examples/samba/LDAP/samba-schema-netscapeds4.x
 share/examples/samba/LDAP/samba-schema-netscapeds5.x
 share/examples/samba/LDAP/samba-schema.IBMSecureWay
@@ -220,6 +272,8 @@ share/examples/samba/validchars/nwdos70.out
 share/examples/samba/validchars/readme
 share/examples/samba/validchars/validchr.c
 share/examples/samba/validchars/validchr.com
+share/examples/samba/wins_hook/README
+share/examples/samba/wins_hook/dns_update
 share/swat/help/Samba-Developers-Guide.html
 share/swat/help/AccessControls.html
 share/swat/help/AdvancedNetworkManagement.html
@@ -258,8 +312,10 @@ share/swat/help/introduction.html
 share/swat/help/ix01.html
 share/swat/help/lmhosts.5.html
 share/swat/help/locking.html
+share/swat/help/log2pcap.1.html
 share/swat/help/msdfs.html
 share/swat/help/migration.html
+share/swat/help/mount.cifs.8.html
 share/swat/help/net.8.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
@@ -269,6 +325,8 @@ share/swat/help/pam.html
 share/swat/help/passdb.html
 share/swat/help/pdbedit.8.html
 share/swat/help/printing.html
+share/swat/help/pr01.html
+share/swat/help/pr02.html
 share/swat/help/problems.html
 share/swat/help/profiles.1.html
 share/swat/help/rpcclient.1.html
@@ -340,172 +398,175 @@ share/swat/lang/tr/images/shares.gif
 share/swat/lang/tr/images/status.gif
 share/swat/lang/tr/images/viewconfig.gif
 share/swat/lang/tr/include/header.html
-share/swat/using_samba/appa_01.html
-share/swat/using_samba/appa_02.html
-share/swat/using_samba/appa_03.html
-share/swat/using_samba/appa_04.html
-share/swat/using_samba/appa_05.html
-share/swat/using_samba/appb_01.html
-share/swat/using_samba/appb_02.html
-share/swat/using_samba/appb_03.html
-share/swat/using_samba/appc_01.html
-share/swat/using_samba/appd_01.html
-share/swat/using_samba/appe_01.html
-share/swat/using_samba/appf_01.html
-share/swat/using_samba/ch01_01.html
-share/swat/using_samba/ch01_02.html
-share/swat/using_samba/ch01_03.html
-share/swat/using_samba/ch01_04.html
-share/swat/using_samba/ch01_05.html
-share/swat/using_samba/ch01_06.html
-share/swat/using_samba/ch01_07.html
-share/swat/using_samba/ch01_08.html
-share/swat/using_samba/ch02_01.html
-share/swat/using_samba/ch02_02.html
-share/swat/using_samba/ch02_03.html
-share/swat/using_samba/ch02_04.html
-share/swat/using_samba/ch02_05.html
-share/swat/using_samba/ch02_06.html
-share/swat/using_samba/ch03_01.html
-share/swat/using_samba/ch03_02.html
-share/swat/using_samba/ch03_03.html
-share/swat/using_samba/ch04_01.html
-share/swat/using_samba/ch04_02.html
-share/swat/using_samba/ch04_03.html
-share/swat/using_samba/ch04_04.html
-share/swat/using_samba/ch04_05.html
-share/swat/using_samba/ch04_06.html
-share/swat/using_samba/ch04_07.html
-share/swat/using_samba/ch04_08.html
-share/swat/using_samba/ch05_01.html
-share/swat/using_samba/ch05_02.html
-share/swat/using_samba/ch05_03.html
-share/swat/using_samba/ch05_04.html
-share/swat/using_samba/ch05_05.html
-share/swat/using_samba/ch06_01.html
-share/swat/using_samba/ch06_02.html
-share/swat/using_samba/ch06_03.html
-share/swat/using_samba/ch06_04.html
-share/swat/using_samba/ch06_05.html
-share/swat/using_samba/ch06_06.html
-share/swat/using_samba/ch07_01.html
-share/swat/using_samba/ch07_02.html
-share/swat/using_samba/ch07_03.html
-share/swat/using_samba/ch08_01.html
-share/swat/using_samba/ch08_02.html
-share/swat/using_samba/ch08_03.html
-share/swat/using_samba/ch08_04.html
-share/swat/using_samba/ch08_05.html
-share/swat/using_samba/ch08_06.html
-share/swat/using_samba/ch08_07.html
-share/swat/using_samba/ch09_01.html
-share/swat/using_samba/ch09_02.html
-share/swat/using_samba/ch09_03.html
-share/swat/using_samba/figs/sam.0101.gif
-share/swat/using_samba/figs/sam.0102.gif
-share/swat/using_samba/figs/sam.0103.gif
-share/swat/using_samba/figs/sam.0104.gif
-share/swat/using_samba/figs/sam.0105.gif
-share/swat/using_samba/figs/sam.0106.gif
-share/swat/using_samba/figs/sam.0107.gif
-share/swat/using_samba/figs/sam.0108.gif
-share/swat/using_samba/figs/sam.0109.gif
-share/swat/using_samba/figs/sam.0110.gif
-share/swat/using_samba/figs/sam.0111.gif
-share/swat/using_samba/figs/sam.0112.gif
-share/swat/using_samba/figs/sam.0113.gif
-share/swat/using_samba/figs/sam.0114.gif
-share/swat/using_samba/figs/sam.0201.gif
-share/swat/using_samba/figs/sam.0202.gif
-share/swat/using_samba/figs/sam.0203.gif
-share/swat/using_samba/figs/sam.0204.gif
-share/swat/using_samba/figs/sam.0301.gif
-share/swat/using_samba/figs/sam.0302.gif
-share/swat/using_samba/figs/sam.0303.gif
-share/swat/using_samba/figs/sam.0304.gif
-share/swat/using_samba/figs/sam.0305.gif
-share/swat/using_samba/figs/sam.0306.gif
-share/swat/using_samba/figs/sam.0307.gif
-share/swat/using_samba/figs/sam.0308.gif
-share/swat/using_samba/figs/sam.0309.gif
-share/swat/using_samba/figs/sam.0310.gif
-share/swat/using_samba/figs/sam.0311.gif
-share/swat/using_samba/figs/sam.0312.gif
-share/swat/using_samba/figs/sam.0313.gif
-share/swat/using_samba/figs/sam.0314.gif
-share/swat/using_samba/figs/sam.0315.gif
-share/swat/using_samba/figs/sam.0316.gif
-share/swat/using_samba/figs/sam.0317.gif
-share/swat/using_samba/figs/sam.0318.gif
-share/swat/using_samba/figs/sam.0319.gif
-share/swat/using_samba/figs/sam.0320.gif
-share/swat/using_samba/figs/sam.0321.gif
-share/swat/using_samba/figs/sam.0322.gif
-share/swat/using_samba/figs/sam.0323.gif
-share/swat/using_samba/figs/sam.0324.gif
-share/swat/using_samba/figs/sam.0325.gif
-share/swat/using_samba/figs/sam.0326.gif
-share/swat/using_samba/figs/sam.0327.gif
-share/swat/using_samba/figs/sam.0328.gif
-share/swat/using_samba/figs/sam.0401.gif
-share/swat/using_samba/figs/sam.0402.gif
-share/swat/using_samba/figs/sam.0403.gif
-share/swat/using_samba/figs/sam.0404.gif
-share/swat/using_samba/figs/sam.0405.gif
-share/swat/using_samba/figs/sam.0406.gif
-share/swat/using_samba/figs/sam.0407.gif
-share/swat/using_samba/figs/sam.0501.gif
-share/swat/using_samba/figs/sam.0502.gif
-share/swat/using_samba/figs/sam.0503.gif
-share/swat/using_samba/figs/sam.0504.gif
-share/swat/using_samba/figs/sam.0505.gif
-share/swat/using_samba/figs/sam.0506.gif
-share/swat/using_samba/figs/sam.0507.gif
-share/swat/using_samba/figs/sam.0508.gif
-share/swat/using_samba/figs/sam.0601.gif
-share/swat/using_samba/figs/sam.0602.gif
-share/swat/using_samba/figs/sam.0603.gif
-share/swat/using_samba/figs/sam.0604.gif
-share/swat/using_samba/figs/sam.0605.gif
-share/swat/using_samba/figs/sam.0606.gif
-share/swat/using_samba/figs/sam.0701.gif
-share/swat/using_samba/figs/sam.0702.gif
-share/swat/using_samba/figs/sam.0703.gif
-share/swat/using_samba/figs/sam.0704.gif
-share/swat/using_samba/figs/sam.0705.gif
-share/swat/using_samba/figs/sam.0706.gif
-share/swat/using_samba/figs/sam.0707.gif
-share/swat/using_samba/figs/sam.0708.gif
-share/swat/using_samba/figs/sam.0709.gif
-share/swat/using_samba/figs/sam.0801.gif
-share/swat/using_samba/figs/sam.0802.gif
-share/swat/using_samba/figs/sam.0803.gif
-share/swat/using_samba/figs/sam.0804.gif
-share/swat/using_samba/figs/sam.0805.gif
-share/swat/using_samba/figs/sam.0901.gif
-share/swat/using_samba/figs/sam.0902.gif
-share/swat/using_samba/figs/sam.0903.gif
-share/swat/using_samba/figs/sam.0904.gif
-share/swat/using_samba/figs/sam.0905.gif
-share/swat/using_samba/figs/sam.aa01.gif
-share/swat/using_samba/figs/sam.ab01.gif
-share/swat/using_samba/figs/sam.ab02.gif
-share/swat/using_samba/gifs/index.gif
-share/swat/using_samba/gifs/samba.s.gif
-share/swat/using_samba/gifs/txthome.gif
-share/swat/using_samba/gifs/txtnexta.gif
-share/swat/using_samba/gifs/txtpreva.gif
-share/swat/using_samba/index.html
+share/swat/using_samba/appa.html
+share/swat/using_samba/appb.html
+share/swat/using_samba/appc.html
+share/swat/using_samba/appd.html
+share/swat/using_samba/appe.html
+share/swat/using_samba/appf.html
+share/swat/using_samba/appg.html
+share/swat/using_samba/ch00.html
+share/swat/using_samba/ch01.html
+share/swat/using_samba/ch02.html
+share/swat/using_samba/ch03.html
+share/swat/using_samba/ch04.html
+share/swat/using_samba/ch05.html
+share/swat/using_samba/ch06.html
+share/swat/using_samba/ch07.html
+share/swat/using_samba/ch08.html
+share/swat/using_samba/ch09.html
+share/swat/using_samba/ch10.html
+share/swat/using_samba/ch11.html
+share/swat/using_samba/ch12.html
+share/swat/using_samba/figs/sam2_0101.gif
+share/swat/using_samba/figs/sam2_0102.gif
+share/swat/using_samba/figs/sam2_0103.gif
+share/swat/using_samba/figs/sam2_0104.gif
+share/swat/using_samba/figs/sam2_0105.gif
+share/swat/using_samba/figs/sam2_0106.gif
+share/swat/using_samba/figs/sam2_0107.gif
+share/swat/using_samba/figs/sam2_0108.gif
+share/swat/using_samba/figs/sam2_0109.gif
+share/swat/using_samba/figs/sam2_0110.gif
+share/swat/using_samba/figs/sam2_0111.gif
+share/swat/using_samba/figs/sam2_0112.gif
+share/swat/using_samba/figs/sam2_0113.gif
+share/swat/using_samba/figs/sam2_0114.gif
+share/swat/using_samba/figs/sam2_0201.gif
+share/swat/using_samba/figs/sam2_0202.gif
+share/swat/using_samba/figs/sam2_0203.gif
+share/swat/using_samba/figs/sam2_0204.gif
+share/swat/using_samba/figs/sam2_0301.gif
+share/swat/using_samba/figs/sam2_0302.gif
+share/swat/using_samba/figs/sam2_0303.gif
+share/swat/using_samba/figs/sam2_0304.gif
+share/swat/using_samba/figs/sam2_0305.gif
+share/swat/using_samba/figs/sam2_0306.gif
+share/swat/using_samba/figs/sam2_0307.gif
+share/swat/using_samba/figs/sam2_0308.gif
+share/swat/using_samba/figs/sam2_0309.gif
+share/swat/using_samba/figs/sam2_0310.gif
+share/swat/using_samba/figs/sam2_0311.gif
+share/swat/using_samba/figs/sam2_0312.gif
+share/swat/using_samba/figs/sam2_0313.gif
+share/swat/using_samba/figs/sam2_0314.gif
+share/swat/using_samba/figs/sam2_0315.gif
+share/swat/using_samba/figs/sam2_0316.gif
+share/swat/using_samba/figs/sam2_0317.gif
+share/swat/using_samba/figs/sam2_0318.gif
+share/swat/using_samba/figs/sam2_0319.gif
+share/swat/using_samba/figs/sam2_0320.gif
+share/swat/using_samba/figs/sam2_0321.gif
+share/swat/using_samba/figs/sam2_0322.gif
+share/swat/using_samba/figs/sam2_0323.gif
+share/swat/using_samba/figs/sam2_0324.gif
+share/swat/using_samba/figs/sam2_0325.gif
+share/swat/using_samba/figs/sam2_0326.gif
+share/swat/using_samba/figs/sam2_0327.gif
+share/swat/using_samba/figs/sam2_0328.gif
+share/swat/using_samba/figs/sam2_0329.gif
+share/swat/using_samba/figs/sam2_0330.gif
+share/swat/using_samba/figs/sam2_0331.gif
+share/swat/using_samba/figs/sam2_0332.gif
+share/swat/using_samba/figs/sam2_0333.gif
+share/swat/using_samba/figs/sam2_0334.gif
+share/swat/using_samba/figs/sam2_0335.gif
+share/swat/using_samba/figs/sam2_0336.gif
+share/swat/using_samba/figs/sam2_0337.gif
+share/swat/using_samba/figs/sam2_0338.gif
+share/swat/using_samba/figs/sam2_0339.gif
+share/swat/using_samba/figs/sam2_0340.gif
+share/swat/using_samba/figs/sam2_0341.gif
+share/swat/using_samba/figs/sam2_0342.gif
+share/swat/using_samba/figs/sam2_0343.gif
+share/swat/using_samba/figs/sam2_0344.gif
+share/swat/using_samba/figs/sam2_0345.gif
+share/swat/using_samba/figs/sam2_0346.gif
+share/swat/using_samba/figs/sam2_0347.gif
+share/swat/using_samba/figs/sam2_0348.gif
+share/swat/using_samba/figs/sam2_0349.gif
+share/swat/using_samba/figs/sam2_0350.gif
+share/swat/using_samba/figs/sam2_0351.gif
+share/swat/using_samba/figs/sam2_0352.gif
+share/swat/using_samba/figs/sam2_0353.gif
+share/swat/using_samba/figs/sam2_0354.gif
+share/swat/using_samba/figs/sam2_0355.gif
+share/swat/using_samba/figs/sam2_0356.gif
+share/swat/using_samba/figs/sam2_0357.gif
+share/swat/using_samba/figs/sam2_0358.gif
+share/swat/using_samba/figs/sam2_0359.gif
+share/swat/using_samba/figs/sam2_0360.gif
+share/swat/using_samba/figs/sam2_0361.gif
+share/swat/using_samba/figs/sam2_0401.gif
+share/swat/using_samba/figs/sam2_0402.gif
+share/swat/using_samba/figs/sam2_0403.gif
+share/swat/using_samba/figs/sam2_0404.gif
+share/swat/using_samba/figs/sam2_0405.gif
+share/swat/using_samba/figs/sam2_0406.gif
+share/swat/using_samba/figs/sam2_0407.gif
+share/swat/using_samba/figs/sam2_0408.gif
+share/swat/using_samba/figs/sam2_0409.gif
+share/swat/using_samba/figs/sam2_0410.gif
+share/swat/using_samba/figs/sam2_0411.gif
+share/swat/using_samba/figs/sam2_0412.gif
+share/swat/using_samba/figs/sam2_0413.gif
+share/swat/using_samba/figs/sam2_0414.gif
+share/swat/using_samba/figs/sam2_0415.gif
+share/swat/using_samba/figs/sam2_0416.gif
+share/swat/using_samba/figs/sam2_0417.gif
+share/swat/using_samba/figs/sam2_0501.gif
+share/swat/using_samba/figs/sam2_0502.gif
+share/swat/using_samba/figs/sam2_0503.gif
+share/swat/using_samba/figs/sam2_0504.gif
+share/swat/using_samba/figs/sam2_0505.gif
+share/swat/using_samba/figs/sam2_0506.gif
+share/swat/using_samba/figs/sam2_0507.gif
+share/swat/using_samba/figs/sam2_0508.gif
+share/swat/using_samba/figs/sam2_0601.gif
+share/swat/using_samba/figs/sam2_0602.gif
+share/swat/using_samba/figs/sam2_0603.gif
+share/swat/using_samba/figs/sam2_0604.gif
+share/swat/using_samba/figs/sam2_0605.gif
+share/swat/using_samba/figs/sam2_0701.gif
+share/swat/using_samba/figs/sam2_0801.gif
+share/swat/using_samba/figs/sam2_0802.gif
+share/swat/using_samba/figs/sam2_0803.gif
+share/swat/using_samba/figs/sam2_0804.gif
+share/swat/using_samba/figs/sam2_0805.gif
+share/swat/using_samba/figs/sam2_0806.gif
+share/swat/using_samba/figs/sam2_0807.gif
+share/swat/using_samba/figs/sam2_0808.gif
+share/swat/using_samba/figs/sam2_0809.gif
+share/swat/using_samba/figs/sam2_0810.gif
+share/swat/using_samba/figs/sam2_0811.gif
+share/swat/using_samba/figs/sam2_0901.gif
+share/swat/using_samba/figs/sam2_0902.gif
+share/swat/using_samba/figs/sam2_0903.gif
+share/swat/using_samba/figs/sam2_1001.gif
+share/swat/using_samba/figs/sam2_1002.gif
+share/swat/using_samba/figs/sam2_1003.gif
+share/swat/using_samba/figs/sam2_1004.gif
+share/swat/using_samba/figs/sam2_1005.gif
+share/swat/using_samba/figs/sam2_1006.gif
+share/swat/using_samba/figs/sam2_1101.gif
+share/swat/using_samba/figs/sam2_1102.gif
+share/swat/using_samba/figs/sam2_af01.gif
+share/swat/using_samba/figs/sam2_af02.gif
+share/swat/using_samba/figs/sam2_af03.gif
+share/swat/using_samba/figs/sam2_af04.gif
+share/swat/using_samba/figs/sam2_af05.gif
+share/swat/using_samba/figs/sam2_af06.gif
+share/swat/using_samba/figs/sam2_af07.gif
 share/swat/using_samba/inx.html
-share/swat/using_samba/licenseinfo.html
-share/swat/using_samba/this_edition.html
+share/swat/using_samba/toc.html
+share/swat/using_samba/samba2_s.gif
+share/swat/using_samba/samba2_xs.gif
 @dirrm etc/auth
 @dirrm etc/charset
 @dirrm etc/idmap
 @dirrm etc/pdb
 @dirrm etc/rpc
 @dirrm etc/vfs
-@dirrm share/swat/using_samba/gifs
 @dirrm share/swat/using_samba/figs
 @dirrm share/swat/using_samba
 @dirrm share/swat/include
@@ -521,6 +582,9 @@ share/swat/using_samba/this_edition.html
 @dirrm share/swat/lang/tr
 @dirrm share/swat/lang
 @dirrm share/swat
+@dirrm share/examples/samba/LDAP/smbldap-tools/cgi
+@dirrm share/examples/samba/LDAP/smbldap-tools/mkntpwd
+@dirrm share/examples/samba/LDAP/smbldap-tools
 @dirrm share/examples/samba/LDAP
 @dirrm share/examples/samba/validchars
 @dirrm share/examples/samba/tridge
@@ -540,9 +604,9 @@ share/swat/using_samba/this_edition.html
 @dirrm share/examples/samba/auth
 @dirrm share/examples/samba/appliance
 @dirrm share/examples/samba/VFS
+@dirrm share/examples/samba/wins_hook
 @dirrm share/examples/samba
 %%PORTDOCS%%@dirrm share/doc/samba/Registry
-%%PORTDOCS%%@dirrm share/doc/samba/textdocs
 %%PORTDOCS%%@dirrm share/doc/samba/htmldocs
 %%PORTDOCS%%@dirrm share/doc/samba/faq
 %%PORTDOCS%%@dirrm share/doc/samba
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 40bc42c5e50c..c8b6c08bb753 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0.0.b3
+PORTVERSION=	3.0.0
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	http://us4.samba.org/samba/ftp/%SUBDIR%/archives/
-MASTER_SITE_SUBDIR=	beta alpha old
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
+MASTER_SITES=	http://us3.samba.org/samba/ftp/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. rc
+#DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	dwcjr@FreeBSD.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
@@ -92,13 +92,13 @@ CONFIGURE_ARGS+=	--with-libiconv
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		findsmb.1 nmblookup.1 \
+MAN1=		findsmb.1 nmblookup.1 log2pcap.1 \
 		rpcclient.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
 		smbstatus.1 smbtar.1 testparm.1 testprns.1 wbinfo.1 vfstest.1 \
 		editreg.1 ntlm_auth.1 profiles.1 smbcquotas.1 smbtree.1
 MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7 Samba.7
-MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 net.8 pdbedit.8 \
+MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 net.8 pdbedit.8 mount.cifs.8 \
 		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8 tdbbackup.8
 
 post-install:
@@ -150,7 +150,7 @@ post-install:
 			${WRKDIR}/${DISTNAME}/docs/history ; do		\
 		${INSTALL_DATA} $$i ${DOCSDIR} ;		\
 	done
-	for i in faq htmldocs textdocs Registry ; do			\
+	for i in faq htmldocs Registry ; do			\
 		${MKDIR} ${DOCSDIR}/$$i ;		\
 		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
 			if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
@@ -160,7 +160,6 @@ post-install:
 			fi; \
 		done							\
 	done
-	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${DOCSDIR}/README.swat
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index ad7f031a84d0..525e7a4cd22d 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-3.0.0beta3.tar.bz2) = a5455bfd675a3e6a75dfed468ae22305
+MD5 (samba-3.0.0.tar.bz2) = f54ba49f9a5ef6090272acf8db2e066d
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 00a30098bc0b..2346307dcb40 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -18,19 +18,35 @@ bin/smbtree
 bin/tdbbackup
 bin/testparm
 bin/testprns
-etc/rc.d/samba.sh.sample
+bin/wbinfo
+etc/charset/CP437.so
+etc/charset/CP850.so
+etc/de.msg
+etc/en.msg
+etc/fr.msg
+etc/it.msg
+etc/ja.msg
 etc/lowcase.dat
+etc/pl.msg
+etc/rc.d/samba.sh.sample
 etc/smb.conf.default
+etc/tr.msg
 etc/upcase.dat
 etc/valid.dat
 etc/vfs/audit.so
+etc/vfs/cap.so
+etc/vfs/default_quota.so
 etc/vfs/extd_audit.so
 etc/vfs/fake_perms.so
 etc/vfs/netatalk.so
+etc/vfs/readonly.so
 etc/vfs/recycle.so
+include/libsmbclient.h
+lib/libsmbclient.so
 sbin/nmbd
 sbin/smbd
 sbin/swat
+sbin/winbindd
 %%PORTDOCS%%share/doc/samba/faq/FAQ-ClientApp.html
 %%PORTDOCS%%share/doc/samba/faq/FAQ-Install.html
 %%PORTDOCS%%share/doc/samba/faq/FAQ-errors.html
@@ -40,7 +56,6 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/COPYING
 %%PORTDOCS%%share/doc/samba/Manifest
 %%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
@@ -94,8 +109,10 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/integrate-ms-networks.html
 %%PORTDOCS%%share/doc/samba/htmldocs/introduction.html
 %%PORTDOCS%%share/doc/samba/htmldocs/locking.html
+%%PORTDOCS%%share/doc/samba/htmldocs/log2pcap.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html
 %%PORTDOCS%%share/doc/samba/htmldocs/migration.html
+%%PORTDOCS%%share/doc/samba/htmldocs/mount.cifs.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/msdfs.html
 %%PORTDOCS%%share/doc/samba/htmldocs/net.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/nmbd.8.html
@@ -105,6 +122,8 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/pam.html
 %%PORTDOCS%%share/doc/samba/htmldocs/passdb.html
 %%PORTDOCS%%share/doc/samba/htmldocs/pdbedit.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pr01.html
+%%PORTDOCS%%share/doc/samba/htmldocs/pr02.html
 %%PORTDOCS%%share/doc/samba/htmldocs/printing.html
 %%PORTDOCS%%share/doc/samba/htmldocs/problems.html
 %%PORTDOCS%%share/doc/samba/htmldocs/profiles.1.html
@@ -112,6 +131,7 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/samba.7.html
 %%PORTDOCS%%share/doc/samba/htmldocs/samba-bdc.html
 %%PORTDOCS%%share/doc/samba/htmldocs/samba-pdc.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba.css
 %%PORTDOCS%%share/doc/samba/htmldocs/securing-samba.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smb.conf.5.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbcacls.1.html
@@ -143,8 +163,6 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/wbinfo.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/winbind.html
 %%PORTDOCS%%share/doc/samba/htmldocs/winbindd.8.html
-%%PORTDOCS%%share/doc/samba/textdocs/README.NOW
-%%PORTDOCS%%share/doc/samba/textdocs/README.jis
 share/examples/samba/README
 share/examples/samba/VFS/.cvsignore
 share/examples/samba/VFS/Makefile.in
@@ -152,15 +170,49 @@ share/examples/samba/VFS/README
 share/examples/samba/VFS/autogen.sh
 share/examples/samba/VFS/configure.in
 share/examples/samba/VFS/install-sh
+share/examples/samba/VFS/shadow_copy_test.c
 share/examples/samba/VFS/skel_opaque.c
 share/examples/samba/VFS/skel_transparent.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/md4.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.h
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/Makefile
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.h
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/smbdes.c
+share/examples/samba/LDAP/smbldap-tools/cgi/ldappass.cgi
+share/examples/samba/LDAP/smbldap-tools/cgi/README
+share/examples/samba/LDAP/smbldap-tools/ChangeLog
+share/examples/samba/LDAP/smbldap-tools/COPYING
+share/examples/samba/LDAP/smbldap-tools/Makefile
+share/examples/samba/LDAP/smbldap-tools/FILES
+share/examples/samba/LDAP/smbldap-tools/INSTALL
+share/examples/samba/LDAP/smbldap-tools/INFRASTRUCTURE
+share/examples/samba/LDAP/smbldap-tools/README
+share/examples/samba/LDAP/smbldap-tools/TODO
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupadd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupdel.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupmod.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupshow.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-accounts.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-groups.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-passwd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-populate.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-tools.spec
+share/examples/samba/LDAP/smbldap-tools/smbldap-useradd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-userdel.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-usermod.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-usershow.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap_conf.pm
+share/examples/samba/LDAP/smbldap-tools/CONTRIBUTORS
+share/examples/samba/LDAP/smbldap-tools/smbldap_tools.pm
 share/examples/samba/LDAP/README
 share/examples/samba/LDAP/convertSambaAccount
-share/examples/samba/LDAP/export_smbpasswd.pl
-share/examples/samba/LDAP/import_smbpasswd.pl
-share/examples/samba/LDAP/ldapchpasswd
 share/examples/samba/LDAP/ldapsync.pl
 share/examples/samba/LDAP/samba.schema
+share/examples/samba/LDAP/samba.schema.at.IBM-DS
+share/examples/samba/LDAP/samba.schema.oc.IBM-DS
+share/examples/samba/LDAP/samba-nds.schema
 share/examples/samba/LDAP/samba-schema-netscapeds4.x
 share/examples/samba/LDAP/samba-schema-netscapeds5.x
 share/examples/samba/LDAP/samba-schema.IBMSecureWay
@@ -220,6 +272,8 @@ share/examples/samba/validchars/nwdos70.out
 share/examples/samba/validchars/readme
 share/examples/samba/validchars/validchr.c
 share/examples/samba/validchars/validchr.com
+share/examples/samba/wins_hook/README
+share/examples/samba/wins_hook/dns_update
 share/swat/help/Samba-Developers-Guide.html
 share/swat/help/AccessControls.html
 share/swat/help/AdvancedNetworkManagement.html
@@ -258,8 +312,10 @@ share/swat/help/introduction.html
 share/swat/help/ix01.html
 share/swat/help/lmhosts.5.html
 share/swat/help/locking.html
+share/swat/help/log2pcap.1.html
 share/swat/help/msdfs.html
 share/swat/help/migration.html
+share/swat/help/mount.cifs.8.html
 share/swat/help/net.8.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
@@ -269,6 +325,8 @@ share/swat/help/pam.html
 share/swat/help/passdb.html
 share/swat/help/pdbedit.8.html
 share/swat/help/printing.html
+share/swat/help/pr01.html
+share/swat/help/pr02.html
 share/swat/help/problems.html
 share/swat/help/profiles.1.html
 share/swat/help/rpcclient.1.html
@@ -340,172 +398,175 @@ share/swat/lang/tr/images/shares.gif
 share/swat/lang/tr/images/status.gif
 share/swat/lang/tr/images/viewconfig.gif
 share/swat/lang/tr/include/header.html
-share/swat/using_samba/appa_01.html
-share/swat/using_samba/appa_02.html
-share/swat/using_samba/appa_03.html
-share/swat/using_samba/appa_04.html
-share/swat/using_samba/appa_05.html
-share/swat/using_samba/appb_01.html
-share/swat/using_samba/appb_02.html
-share/swat/using_samba/appb_03.html
-share/swat/using_samba/appc_01.html
-share/swat/using_samba/appd_01.html
-share/swat/using_samba/appe_01.html
-share/swat/using_samba/appf_01.html
-share/swat/using_samba/ch01_01.html
-share/swat/using_samba/ch01_02.html
-share/swat/using_samba/ch01_03.html
-share/swat/using_samba/ch01_04.html
-share/swat/using_samba/ch01_05.html
-share/swat/using_samba/ch01_06.html
-share/swat/using_samba/ch01_07.html
-share/swat/using_samba/ch01_08.html
-share/swat/using_samba/ch02_01.html
-share/swat/using_samba/ch02_02.html
-share/swat/using_samba/ch02_03.html
-share/swat/using_samba/ch02_04.html
-share/swat/using_samba/ch02_05.html
-share/swat/using_samba/ch02_06.html
-share/swat/using_samba/ch03_01.html
-share/swat/using_samba/ch03_02.html
-share/swat/using_samba/ch03_03.html
-share/swat/using_samba/ch04_01.html
-share/swat/using_samba/ch04_02.html
-share/swat/using_samba/ch04_03.html
-share/swat/using_samba/ch04_04.html
-share/swat/using_samba/ch04_05.html
-share/swat/using_samba/ch04_06.html
-share/swat/using_samba/ch04_07.html
-share/swat/using_samba/ch04_08.html
-share/swat/using_samba/ch05_01.html
-share/swat/using_samba/ch05_02.html
-share/swat/using_samba/ch05_03.html
-share/swat/using_samba/ch05_04.html
-share/swat/using_samba/ch05_05.html
-share/swat/using_samba/ch06_01.html
-share/swat/using_samba/ch06_02.html
-share/swat/using_samba/ch06_03.html
-share/swat/using_samba/ch06_04.html
-share/swat/using_samba/ch06_05.html
-share/swat/using_samba/ch06_06.html
-share/swat/using_samba/ch07_01.html
-share/swat/using_samba/ch07_02.html
-share/swat/using_samba/ch07_03.html
-share/swat/using_samba/ch08_01.html
-share/swat/using_samba/ch08_02.html
-share/swat/using_samba/ch08_03.html
-share/swat/using_samba/ch08_04.html
-share/swat/using_samba/ch08_05.html
-share/swat/using_samba/ch08_06.html
-share/swat/using_samba/ch08_07.html
-share/swat/using_samba/ch09_01.html
-share/swat/using_samba/ch09_02.html
-share/swat/using_samba/ch09_03.html
-share/swat/using_samba/figs/sam.0101.gif
-share/swat/using_samba/figs/sam.0102.gif
-share/swat/using_samba/figs/sam.0103.gif
-share/swat/using_samba/figs/sam.0104.gif
-share/swat/using_samba/figs/sam.0105.gif
-share/swat/using_samba/figs/sam.0106.gif
-share/swat/using_samba/figs/sam.0107.gif
-share/swat/using_samba/figs/sam.0108.gif
-share/swat/using_samba/figs/sam.0109.gif
-share/swat/using_samba/figs/sam.0110.gif
-share/swat/using_samba/figs/sam.0111.gif
-share/swat/using_samba/figs/sam.0112.gif
-share/swat/using_samba/figs/sam.0113.gif
-share/swat/using_samba/figs/sam.0114.gif
-share/swat/using_samba/figs/sam.0201.gif
-share/swat/using_samba/figs/sam.0202.gif
-share/swat/using_samba/figs/sam.0203.gif
-share/swat/using_samba/figs/sam.0204.gif
-share/swat/using_samba/figs/sam.0301.gif
-share/swat/using_samba/figs/sam.0302.gif
-share/swat/using_samba/figs/sam.0303.gif
-share/swat/using_samba/figs/sam.0304.gif
-share/swat/using_samba/figs/sam.0305.gif
-share/swat/using_samba/figs/sam.0306.gif
-share/swat/using_samba/figs/sam.0307.gif
-share/swat/using_samba/figs/sam.0308.gif
-share/swat/using_samba/figs/sam.0309.gif
-share/swat/using_samba/figs/sam.0310.gif
-share/swat/using_samba/figs/sam.0311.gif
-share/swat/using_samba/figs/sam.0312.gif
-share/swat/using_samba/figs/sam.0313.gif
-share/swat/using_samba/figs/sam.0314.gif
-share/swat/using_samba/figs/sam.0315.gif
-share/swat/using_samba/figs/sam.0316.gif
-share/swat/using_samba/figs/sam.0317.gif
-share/swat/using_samba/figs/sam.0318.gif
-share/swat/using_samba/figs/sam.0319.gif
-share/swat/using_samba/figs/sam.0320.gif
-share/swat/using_samba/figs/sam.0321.gif
-share/swat/using_samba/figs/sam.0322.gif
-share/swat/using_samba/figs/sam.0323.gif
-share/swat/using_samba/figs/sam.0324.gif
-share/swat/using_samba/figs/sam.0325.gif
-share/swat/using_samba/figs/sam.0326.gif
-share/swat/using_samba/figs/sam.0327.gif
-share/swat/using_samba/figs/sam.0328.gif
-share/swat/using_samba/figs/sam.0401.gif
-share/swat/using_samba/figs/sam.0402.gif
-share/swat/using_samba/figs/sam.0403.gif
-share/swat/using_samba/figs/sam.0404.gif
-share/swat/using_samba/figs/sam.0405.gif
-share/swat/using_samba/figs/sam.0406.gif
-share/swat/using_samba/figs/sam.0407.gif
-share/swat/using_samba/figs/sam.0501.gif
-share/swat/using_samba/figs/sam.0502.gif
-share/swat/using_samba/figs/sam.0503.gif
-share/swat/using_samba/figs/sam.0504.gif
-share/swat/using_samba/figs/sam.0505.gif
-share/swat/using_samba/figs/sam.0506.gif
-share/swat/using_samba/figs/sam.0507.gif
-share/swat/using_samba/figs/sam.0508.gif
-share/swat/using_samba/figs/sam.0601.gif
-share/swat/using_samba/figs/sam.0602.gif
-share/swat/using_samba/figs/sam.0603.gif
-share/swat/using_samba/figs/sam.0604.gif
-share/swat/using_samba/figs/sam.0605.gif
-share/swat/using_samba/figs/sam.0606.gif
-share/swat/using_samba/figs/sam.0701.gif
-share/swat/using_samba/figs/sam.0702.gif
-share/swat/using_samba/figs/sam.0703.gif
-share/swat/using_samba/figs/sam.0704.gif
-share/swat/using_samba/figs/sam.0705.gif
-share/swat/using_samba/figs/sam.0706.gif
-share/swat/using_samba/figs/sam.0707.gif
-share/swat/using_samba/figs/sam.0708.gif
-share/swat/using_samba/figs/sam.0709.gif
-share/swat/using_samba/figs/sam.0801.gif
-share/swat/using_samba/figs/sam.0802.gif
-share/swat/using_samba/figs/sam.0803.gif
-share/swat/using_samba/figs/sam.0804.gif
-share/swat/using_samba/figs/sam.0805.gif
-share/swat/using_samba/figs/sam.0901.gif
-share/swat/using_samba/figs/sam.0902.gif
-share/swat/using_samba/figs/sam.0903.gif
-share/swat/using_samba/figs/sam.0904.gif
-share/swat/using_samba/figs/sam.0905.gif
-share/swat/using_samba/figs/sam.aa01.gif
-share/swat/using_samba/figs/sam.ab01.gif
-share/swat/using_samba/figs/sam.ab02.gif
-share/swat/using_samba/gifs/index.gif
-share/swat/using_samba/gifs/samba.s.gif
-share/swat/using_samba/gifs/txthome.gif
-share/swat/using_samba/gifs/txtnexta.gif
-share/swat/using_samba/gifs/txtpreva.gif
-share/swat/using_samba/index.html
+share/swat/using_samba/appa.html
+share/swat/using_samba/appb.html
+share/swat/using_samba/appc.html
+share/swat/using_samba/appd.html
+share/swat/using_samba/appe.html
+share/swat/using_samba/appf.html
+share/swat/using_samba/appg.html
+share/swat/using_samba/ch00.html
+share/swat/using_samba/ch01.html
+share/swat/using_samba/ch02.html
+share/swat/using_samba/ch03.html
+share/swat/using_samba/ch04.html
+share/swat/using_samba/ch05.html
+share/swat/using_samba/ch06.html
+share/swat/using_samba/ch07.html
+share/swat/using_samba/ch08.html
+share/swat/using_samba/ch09.html
+share/swat/using_samba/ch10.html
+share/swat/using_samba/ch11.html
+share/swat/using_samba/ch12.html
+share/swat/using_samba/figs/sam2_0101.gif
+share/swat/using_samba/figs/sam2_0102.gif
+share/swat/using_samba/figs/sam2_0103.gif
+share/swat/using_samba/figs/sam2_0104.gif
+share/swat/using_samba/figs/sam2_0105.gif
+share/swat/using_samba/figs/sam2_0106.gif
+share/swat/using_samba/figs/sam2_0107.gif
+share/swat/using_samba/figs/sam2_0108.gif
+share/swat/using_samba/figs/sam2_0109.gif
+share/swat/using_samba/figs/sam2_0110.gif
+share/swat/using_samba/figs/sam2_0111.gif
+share/swat/using_samba/figs/sam2_0112.gif
+share/swat/using_samba/figs/sam2_0113.gif
+share/swat/using_samba/figs/sam2_0114.gif
+share/swat/using_samba/figs/sam2_0201.gif
+share/swat/using_samba/figs/sam2_0202.gif
+share/swat/using_samba/figs/sam2_0203.gif
+share/swat/using_samba/figs/sam2_0204.gif
+share/swat/using_samba/figs/sam2_0301.gif
+share/swat/using_samba/figs/sam2_0302.gif
+share/swat/using_samba/figs/sam2_0303.gif
+share/swat/using_samba/figs/sam2_0304.gif
+share/swat/using_samba/figs/sam2_0305.gif
+share/swat/using_samba/figs/sam2_0306.gif
+share/swat/using_samba/figs/sam2_0307.gif
+share/swat/using_samba/figs/sam2_0308.gif
+share/swat/using_samba/figs/sam2_0309.gif
+share/swat/using_samba/figs/sam2_0310.gif
+share/swat/using_samba/figs/sam2_0311.gif
+share/swat/using_samba/figs/sam2_0312.gif
+share/swat/using_samba/figs/sam2_0313.gif
+share/swat/using_samba/figs/sam2_0314.gif
+share/swat/using_samba/figs/sam2_0315.gif
+share/swat/using_samba/figs/sam2_0316.gif
+share/swat/using_samba/figs/sam2_0317.gif
+share/swat/using_samba/figs/sam2_0318.gif
+share/swat/using_samba/figs/sam2_0319.gif
+share/swat/using_samba/figs/sam2_0320.gif
+share/swat/using_samba/figs/sam2_0321.gif
+share/swat/using_samba/figs/sam2_0322.gif
+share/swat/using_samba/figs/sam2_0323.gif
+share/swat/using_samba/figs/sam2_0324.gif
+share/swat/using_samba/figs/sam2_0325.gif
+share/swat/using_samba/figs/sam2_0326.gif
+share/swat/using_samba/figs/sam2_0327.gif
+share/swat/using_samba/figs/sam2_0328.gif
+share/swat/using_samba/figs/sam2_0329.gif
+share/swat/using_samba/figs/sam2_0330.gif
+share/swat/using_samba/figs/sam2_0331.gif
+share/swat/using_samba/figs/sam2_0332.gif
+share/swat/using_samba/figs/sam2_0333.gif
+share/swat/using_samba/figs/sam2_0334.gif
+share/swat/using_samba/figs/sam2_0335.gif
+share/swat/using_samba/figs/sam2_0336.gif
+share/swat/using_samba/figs/sam2_0337.gif
+share/swat/using_samba/figs/sam2_0338.gif
+share/swat/using_samba/figs/sam2_0339.gif
+share/swat/using_samba/figs/sam2_0340.gif
+share/swat/using_samba/figs/sam2_0341.gif
+share/swat/using_samba/figs/sam2_0342.gif
+share/swat/using_samba/figs/sam2_0343.gif
+share/swat/using_samba/figs/sam2_0344.gif
+share/swat/using_samba/figs/sam2_0345.gif
+share/swat/using_samba/figs/sam2_0346.gif
+share/swat/using_samba/figs/sam2_0347.gif
+share/swat/using_samba/figs/sam2_0348.gif
+share/swat/using_samba/figs/sam2_0349.gif
+share/swat/using_samba/figs/sam2_0350.gif
+share/swat/using_samba/figs/sam2_0351.gif
+share/swat/using_samba/figs/sam2_0352.gif
+share/swat/using_samba/figs/sam2_0353.gif
+share/swat/using_samba/figs/sam2_0354.gif
+share/swat/using_samba/figs/sam2_0355.gif
+share/swat/using_samba/figs/sam2_0356.gif
+share/swat/using_samba/figs/sam2_0357.gif
+share/swat/using_samba/figs/sam2_0358.gif
+share/swat/using_samba/figs/sam2_0359.gif
+share/swat/using_samba/figs/sam2_0360.gif
+share/swat/using_samba/figs/sam2_0361.gif
+share/swat/using_samba/figs/sam2_0401.gif
+share/swat/using_samba/figs/sam2_0402.gif
+share/swat/using_samba/figs/sam2_0403.gif
+share/swat/using_samba/figs/sam2_0404.gif
+share/swat/using_samba/figs/sam2_0405.gif
+share/swat/using_samba/figs/sam2_0406.gif
+share/swat/using_samba/figs/sam2_0407.gif
+share/swat/using_samba/figs/sam2_0408.gif
+share/swat/using_samba/figs/sam2_0409.gif
+share/swat/using_samba/figs/sam2_0410.gif
+share/swat/using_samba/figs/sam2_0411.gif
+share/swat/using_samba/figs/sam2_0412.gif
+share/swat/using_samba/figs/sam2_0413.gif
+share/swat/using_samba/figs/sam2_0414.gif
+share/swat/using_samba/figs/sam2_0415.gif
+share/swat/using_samba/figs/sam2_0416.gif
+share/swat/using_samba/figs/sam2_0417.gif
+share/swat/using_samba/figs/sam2_0501.gif
+share/swat/using_samba/figs/sam2_0502.gif
+share/swat/using_samba/figs/sam2_0503.gif
+share/swat/using_samba/figs/sam2_0504.gif
+share/swat/using_samba/figs/sam2_0505.gif
+share/swat/using_samba/figs/sam2_0506.gif
+share/swat/using_samba/figs/sam2_0507.gif
+share/swat/using_samba/figs/sam2_0508.gif
+share/swat/using_samba/figs/sam2_0601.gif
+share/swat/using_samba/figs/sam2_0602.gif
+share/swat/using_samba/figs/sam2_0603.gif
+share/swat/using_samba/figs/sam2_0604.gif
+share/swat/using_samba/figs/sam2_0605.gif
+share/swat/using_samba/figs/sam2_0701.gif
+share/swat/using_samba/figs/sam2_0801.gif
+share/swat/using_samba/figs/sam2_0802.gif
+share/swat/using_samba/figs/sam2_0803.gif
+share/swat/using_samba/figs/sam2_0804.gif
+share/swat/using_samba/figs/sam2_0805.gif
+share/swat/using_samba/figs/sam2_0806.gif
+share/swat/using_samba/figs/sam2_0807.gif
+share/swat/using_samba/figs/sam2_0808.gif
+share/swat/using_samba/figs/sam2_0809.gif
+share/swat/using_samba/figs/sam2_0810.gif
+share/swat/using_samba/figs/sam2_0811.gif
+share/swat/using_samba/figs/sam2_0901.gif
+share/swat/using_samba/figs/sam2_0902.gif
+share/swat/using_samba/figs/sam2_0903.gif
+share/swat/using_samba/figs/sam2_1001.gif
+share/swat/using_samba/figs/sam2_1002.gif
+share/swat/using_samba/figs/sam2_1003.gif
+share/swat/using_samba/figs/sam2_1004.gif
+share/swat/using_samba/figs/sam2_1005.gif
+share/swat/using_samba/figs/sam2_1006.gif
+share/swat/using_samba/figs/sam2_1101.gif
+share/swat/using_samba/figs/sam2_1102.gif
+share/swat/using_samba/figs/sam2_af01.gif
+share/swat/using_samba/figs/sam2_af02.gif
+share/swat/using_samba/figs/sam2_af03.gif
+share/swat/using_samba/figs/sam2_af04.gif
+share/swat/using_samba/figs/sam2_af05.gif
+share/swat/using_samba/figs/sam2_af06.gif
+share/swat/using_samba/figs/sam2_af07.gif
 share/swat/using_samba/inx.html
-share/swat/using_samba/licenseinfo.html
-share/swat/using_samba/this_edition.html
+share/swat/using_samba/toc.html
+share/swat/using_samba/samba2_s.gif
+share/swat/using_samba/samba2_xs.gif
 @dirrm etc/auth
 @dirrm etc/charset
 @dirrm etc/idmap
 @dirrm etc/pdb
 @dirrm etc/rpc
 @dirrm etc/vfs
-@dirrm share/swat/using_samba/gifs
 @dirrm share/swat/using_samba/figs
 @dirrm share/swat/using_samba
 @dirrm share/swat/include
@@ -521,6 +582,9 @@ share/swat/using_samba/this_edition.html
 @dirrm share/swat/lang/tr
 @dirrm share/swat/lang
 @dirrm share/swat
+@dirrm share/examples/samba/LDAP/smbldap-tools/cgi
+@dirrm share/examples/samba/LDAP/smbldap-tools/mkntpwd
+@dirrm share/examples/samba/LDAP/smbldap-tools
 @dirrm share/examples/samba/LDAP
 @dirrm share/examples/samba/validchars
 @dirrm share/examples/samba/tridge
@@ -540,9 +604,9 @@ share/swat/using_samba/this_edition.html
 @dirrm share/examples/samba/auth
 @dirrm share/examples/samba/appliance
 @dirrm share/examples/samba/VFS
+@dirrm share/examples/samba/wins_hook
 @dirrm share/examples/samba
 %%PORTDOCS%%@dirrm share/doc/samba/Registry
-%%PORTDOCS%%@dirrm share/doc/samba/textdocs
 %%PORTDOCS%%@dirrm share/doc/samba/htmldocs
 %%PORTDOCS%%@dirrm share/doc/samba/faq
 %%PORTDOCS%%@dirrm share/doc/samba