Upgrade to 3.0.0 Beta 2.

Submitted by:	maintainer

6 files changed, 210 insertions, 104 deletions

diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index a1575cedef1b..e84f60429494 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0.0.b1
+PORTVERSION=	3.0.0.b2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://us4.samba.org/samba/ftp/%SUBDIR%/
@@ -94,11 +94,12 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
 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 vfstest.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
+MAN7=		samba.7 Samba.7
 MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 net.8 pdbedit.8 \
-		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8
+		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8 tdbbackup.8
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/samba
diff --git a/net/samba-devel/distinfo b/net/samba-devel/distinfo
index 374fb4850cff..119afdea3dab 100644
--- a/net/samba-devel/distinfo
+++ b/net/samba-devel/distinfo
@@ -1 +1 @@
-MD5 (samba-3.0.0beta1.tar.bz2) = e212b1828fe9f4784059b494a5782c95
+MD5 (samba-3.0.0beta2.tar.bz2) = 133ea2c8f1db9ea9a852e6f32407a988
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
index 7223166b96ee..3bebdc236de9 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -1,4 +1,3 @@
-bin/editreg
 bin/findsmb
 bin/make_smbpasswd
 bin/net
@@ -24,13 +23,19 @@ etc/lowcase.dat
 etc/smb.conf.default
 etc/upcase.dat
 etc/valid.dat
+etc/vfs/audit.so
+etc/vfs/extd_audit.so
+etc/vfs/fake_perms.so
+etc/vfs/netatalk.so
+etc/vfs/recycle.so
 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/FAQ-ClientApp.html
+%%PORTDOCS%%share/doc/samba/faq/FAQ-Install.html
+%%PORTDOCS%%share/doc/samba/faq/FAQ-errors.html
+%%PORTDOCS%%share/doc/samba/faq/FAQ-features.html
+%%PORTDOCS%%share/doc/samba/faq/FAQ-general.html
 %%PORTDOCS%%share/doc/samba/faq/samba-faq.html
 %%PORTDOCS%%share/doc/samba/COPYING
 %%PORTDOCS%%share/doc/samba/Manifest
@@ -55,49 +60,65 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/announce
 %%PORTDOCS%%share/doc/samba/history
 %%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/AccessControls.html
+%%PORTDOCS%%share/doc/samba/htmldocs/AdvancedNetworkManagement.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Appendixes.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Backup.html
+%%PORTDOCS%%share/doc/samba/htmldocs/CUPS-printing.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ClientConfig.html
+%%PORTDOCS%%share/doc/samba/htmldocs/DNSDHCP.html
+%%PORTDOCS%%share/doc/samba/htmldocs/FastStart.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Further-Resources.html
+%%PORTDOCS%%share/doc/samba/htmldocs/InterdomainTrusts.html
+%%PORTDOCS%%share/doc/samba/htmldocs/IntroSMB.html
+%%PORTDOCS%%share/doc/samba/htmldocs/NT4Migration.html
+%%PORTDOCS%%share/doc/samba/htmldocs/NetworkBrowsing.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Other-Clients.html
+%%PORTDOCS%%share/doc/samba/htmldocs/PolicyMgmt.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Portability.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ProfileMgmt.html
+%%PORTDOCS%%share/doc/samba/htmldocs/SWAT.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
+%%PORTDOCS%%share/doc/samba/htmldocs/SambaHA.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ServerType.html
+%%PORTDOCS%%share/doc/samba/htmldocs/StandAloneServer.html
 %%PORTDOCS%%share/doc/samba/htmldocs/bugreport.html
-%%PORTDOCS%%share/doc/samba/htmldocs/cvs-access.html
+%%PORTDOCS%%share/doc/samba/htmldocs/compiling.html
 %%PORTDOCS%%share/doc/samba/htmldocs/diagnosis.html
-%%PORTDOCS%%share/doc/samba/htmldocs/domain-security.html
+%%PORTDOCS%%share/doc/samba/htmldocs/domain-member.html
+%%PORTDOCS%%share/doc/samba/htmldocs/editreg.1.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/index.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ix01.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/locking.html
 %%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html
+%%PORTDOCS%%share/doc/samba/htmldocs/migration.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/ntlm_auth.1.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/passdb.html
 %%PORTDOCS%%share/doc/samba/htmldocs/pdbedit.8.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/problems.html
+%%PORTDOCS%%share/doc/samba/htmldocs/profiles.1.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/securing-samba.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/smbcquotas.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbd.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmnt.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmount.8.html
@@ -107,14 +128,18 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/smbspool.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbstatus.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbtar.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbtree.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/tdbbackup.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testparm.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testprns.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/troubleshooting.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/unicode.html
+%%PORTDOCS%%share/doc/samba/htmldocs/upgrading-to-3.0.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/winbind.html
@@ -166,6 +191,7 @@ 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/sambapdb.dtd
 share/examples/samba/pdb/pdb_test.c
 share/examples/samba/printer-accounting/README
 share/examples/samba/printer-accounting/acct-all
@@ -196,49 +222,66 @@ share/examples/samba/validchars/readme
 share/examples/samba/validchars/validchr.c
 share/examples/samba/validchars/validchr.com
 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/AccessControls.html
+share/swat/help/AdvancedNetworkManagement.html
+share/swat/help/Appendixes.html
+share/swat/help/Backup.html
+share/swat/help/CUPS-printing.html
+share/swat/help/ClientConfig.html
+share/swat/help/DNSDHCP.html
+share/swat/help/FastStart.html
+share/swat/help/Further-Resources.html
+share/swat/help/InterdomainTrusts.html
+share/swat/help/IntroSMB.html
+share/swat/help/NT4Migration.html
+share/swat/help/NetworkBrowsing.html
+share/swat/help/Other-Clients.html
+share/swat/help/PolicyMgmt.html
+share/swat/help/Portability.html
+share/swat/help/ProfileMgmt.html
+share/swat/help/SWAT.html
+share/swat/help/Samba-HOWTO-Collection.html
+share/swat/help/SambaHA.html
+share/swat/help/ServerType.html
+share/swat/help/StandAloneServer.html
+share/swat/help/VFS.html
 share/swat/help/bugreport.html
-share/swat/help/cvs-access.html
+share/swat/help/compiling.html
 share/swat/help/diagnosis.html
-share/swat/help/domain-security.html
+share/swat/help/domain-member.html
+share/swat/help/editreg.1.html
 share/swat/help/findsmb.1.html
 share/swat/help/groupmapping.html
-share/swat/help/improved-browsing.html
+share/swat/help/index.html
 share/swat/help/install.html
 share/swat/help/integrate-ms-networks.html
 share/swat/help/introduction.html
+share/swat/help/ix01.html
 share/swat/help/lmhosts.5.html
+share/swat/help/locking.html
 share/swat/help/msdfs.html
+share/swat/help/migration.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/ntlm_auth.1.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/passdb.html
 share/swat/help/pdbedit.8.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/problems.html
+share/swat/help/profiles.1.html
 share/swat/help/rpcclient.1.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/securing-samba.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/smbcquotas.1.html
 share/swat/help/smbd.8.html
 share/swat/help/smbmnt.8.html
 share/swat/help/smbmount.8.html
@@ -248,14 +291,17 @@ share/swat/help/smbsh.1.html
 share/swat/help/smbspool.8.html
 share/swat/help/smbstatus.1.html
 share/swat/help/smbtar.1.html
+share/swat/help/smbtree.1.html
 share/swat/help/smbumount.8.html
 share/swat/help/speed.html
 share/swat/help/swat.8.html
+share/swat/help/tdbbackup.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
+share/swat/help/troubleshooting.html
 share/swat/help/type.html
-share/swat/help/unix-permissions.html
-share/swat/help/vfs.html
+share/swat/help/unicode.html
+share/swat/help/upgrading-to-3.0.html
 share/swat/help/vfstest.1.html
 share/swat/help/wbinfo.1.html
 share/swat/help/welcome.html
@@ -454,6 +500,12 @@ share/swat/using_samba/index.html
 share/swat/using_samba/inx.html
 share/swat/using_samba/licenseinfo.html
 share/swat/using_samba/this_edition.html
+@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
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index a1575cedef1b..e84f60429494 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0.0.b1
+PORTVERSION=	3.0.0.b2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://us4.samba.org/samba/ftp/%SUBDIR%/
@@ -94,11 +94,12 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
 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 vfstest.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
+MAN7=		samba.7 Samba.7
 MAN8=		nmbd.8 smbd.8 smbmnt.8 smbmount.8 net.8 pdbedit.8 \
-		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8
+		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8 tdbbackup.8
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/samba
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 374fb4850cff..119afdea3dab 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-3.0.0beta1.tar.bz2) = e212b1828fe9f4784059b494a5782c95
+MD5 (samba-3.0.0beta2.tar.bz2) = 133ea2c8f1db9ea9a852e6f32407a988
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 7223166b96ee..3bebdc236de9 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -1,4 +1,3 @@
-bin/editreg
 bin/findsmb
 bin/make_smbpasswd
 bin/net
@@ -24,13 +23,19 @@ etc/lowcase.dat
 etc/smb.conf.default
 etc/upcase.dat
 etc/valid.dat
+etc/vfs/audit.so
+etc/vfs/extd_audit.so
+etc/vfs/fake_perms.so
+etc/vfs/netatalk.so
+etc/vfs/recycle.so
 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/FAQ-ClientApp.html
+%%PORTDOCS%%share/doc/samba/faq/FAQ-Install.html
+%%PORTDOCS%%share/doc/samba/faq/FAQ-errors.html
+%%PORTDOCS%%share/doc/samba/faq/FAQ-features.html
+%%PORTDOCS%%share/doc/samba/faq/FAQ-general.html
 %%PORTDOCS%%share/doc/samba/faq/samba-faq.html
 %%PORTDOCS%%share/doc/samba/COPYING
 %%PORTDOCS%%share/doc/samba/Manifest
@@ -55,49 +60,65 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/announce
 %%PORTDOCS%%share/doc/samba/history
 %%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/AccessControls.html
+%%PORTDOCS%%share/doc/samba/htmldocs/AdvancedNetworkManagement.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Appendixes.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Backup.html
+%%PORTDOCS%%share/doc/samba/htmldocs/CUPS-printing.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ClientConfig.html
+%%PORTDOCS%%share/doc/samba/htmldocs/DNSDHCP.html
+%%PORTDOCS%%share/doc/samba/htmldocs/FastStart.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Further-Resources.html
+%%PORTDOCS%%share/doc/samba/htmldocs/InterdomainTrusts.html
+%%PORTDOCS%%share/doc/samba/htmldocs/IntroSMB.html
+%%PORTDOCS%%share/doc/samba/htmldocs/NT4Migration.html
+%%PORTDOCS%%share/doc/samba/htmldocs/NetworkBrowsing.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Other-Clients.html
+%%PORTDOCS%%share/doc/samba/htmldocs/PolicyMgmt.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Portability.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ProfileMgmt.html
+%%PORTDOCS%%share/doc/samba/htmldocs/SWAT.html
+%%PORTDOCS%%share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
+%%PORTDOCS%%share/doc/samba/htmldocs/SambaHA.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ServerType.html
+%%PORTDOCS%%share/doc/samba/htmldocs/StandAloneServer.html
 %%PORTDOCS%%share/doc/samba/htmldocs/bugreport.html
-%%PORTDOCS%%share/doc/samba/htmldocs/cvs-access.html
+%%PORTDOCS%%share/doc/samba/htmldocs/compiling.html
 %%PORTDOCS%%share/doc/samba/htmldocs/diagnosis.html
-%%PORTDOCS%%share/doc/samba/htmldocs/domain-security.html
+%%PORTDOCS%%share/doc/samba/htmldocs/domain-member.html
+%%PORTDOCS%%share/doc/samba/htmldocs/editreg.1.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/index.html
+%%PORTDOCS%%share/doc/samba/htmldocs/ix01.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/locking.html
 %%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html
+%%PORTDOCS%%share/doc/samba/htmldocs/migration.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/ntlm_auth.1.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/passdb.html
 %%PORTDOCS%%share/doc/samba/htmldocs/pdbedit.8.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/problems.html
+%%PORTDOCS%%share/doc/samba/htmldocs/profiles.1.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/securing-samba.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/smbcquotas.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbd.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmnt.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmount.8.html
@@ -107,14 +128,18 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/smbspool.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbstatus.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbtar.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/smbtree.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/tdbbackup.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testparm.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/testprns.1.html
+%%PORTDOCS%%share/doc/samba/htmldocs/troubleshooting.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/unicode.html
+%%PORTDOCS%%share/doc/samba/htmldocs/upgrading-to-3.0.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/winbind.html
@@ -166,6 +191,7 @@ 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/sambapdb.dtd
 share/examples/samba/pdb/pdb_test.c
 share/examples/samba/printer-accounting/README
 share/examples/samba/printer-accounting/acct-all
@@ -196,49 +222,66 @@ share/examples/samba/validchars/readme
 share/examples/samba/validchars/validchr.c
 share/examples/samba/validchars/validchr.com
 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/AccessControls.html
+share/swat/help/AdvancedNetworkManagement.html
+share/swat/help/Appendixes.html
+share/swat/help/Backup.html
+share/swat/help/CUPS-printing.html
+share/swat/help/ClientConfig.html
+share/swat/help/DNSDHCP.html
+share/swat/help/FastStart.html
+share/swat/help/Further-Resources.html
+share/swat/help/InterdomainTrusts.html
+share/swat/help/IntroSMB.html
+share/swat/help/NT4Migration.html
+share/swat/help/NetworkBrowsing.html
+share/swat/help/Other-Clients.html
+share/swat/help/PolicyMgmt.html
+share/swat/help/Portability.html
+share/swat/help/ProfileMgmt.html
+share/swat/help/SWAT.html
+share/swat/help/Samba-HOWTO-Collection.html
+share/swat/help/SambaHA.html
+share/swat/help/ServerType.html
+share/swat/help/StandAloneServer.html
+share/swat/help/VFS.html
 share/swat/help/bugreport.html
-share/swat/help/cvs-access.html
+share/swat/help/compiling.html
 share/swat/help/diagnosis.html
-share/swat/help/domain-security.html
+share/swat/help/domain-member.html
+share/swat/help/editreg.1.html
 share/swat/help/findsmb.1.html
 share/swat/help/groupmapping.html
-share/swat/help/improved-browsing.html
+share/swat/help/index.html
 share/swat/help/install.html
 share/swat/help/integrate-ms-networks.html
 share/swat/help/introduction.html
+share/swat/help/ix01.html
 share/swat/help/lmhosts.5.html
+share/swat/help/locking.html
 share/swat/help/msdfs.html
+share/swat/help/migration.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/ntlm_auth.1.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/passdb.html
 share/swat/help/pdbedit.8.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/problems.html
+share/swat/help/profiles.1.html
 share/swat/help/rpcclient.1.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/securing-samba.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/smbcquotas.1.html
 share/swat/help/smbd.8.html
 share/swat/help/smbmnt.8.html
 share/swat/help/smbmount.8.html
@@ -248,14 +291,17 @@ share/swat/help/smbsh.1.html
 share/swat/help/smbspool.8.html
 share/swat/help/smbstatus.1.html
 share/swat/help/smbtar.1.html
+share/swat/help/smbtree.1.html
 share/swat/help/smbumount.8.html
 share/swat/help/speed.html
 share/swat/help/swat.8.html
+share/swat/help/tdbbackup.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
+share/swat/help/troubleshooting.html
 share/swat/help/type.html
-share/swat/help/unix-permissions.html
-share/swat/help/vfs.html
+share/swat/help/unicode.html
+share/swat/help/upgrading-to-3.0.html
 share/swat/help/vfstest.1.html
 share/swat/help/wbinfo.1.html
 share/swat/help/welcome.html
@@ -454,6 +500,12 @@ share/swat/using_samba/index.html
 share/swat/using_samba/inx.html
 share/swat/using_samba/licenseinfo.html
 share/swat/using_samba/this_edition.html
+@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