* Update samba-devel to the last stable version, 3.0.1

* Add a patch so libsmbclient.[ch] doesn't get installed, thus the CONFICTS
  with samba-libsmbclient can be removed

PR:		61445
Submitted by:	Koop Mast <kwm@rainbow-runner.nl>
Approved by:	dwcjr (maintainer)

8 files changed, 154 insertions, 140 deletions

diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index b8f79b3d2ecf..459ea0ac93cb 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0.0
+PORTVERSION=	3.0.1
 PORTEPOCH=	1
-PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://us3.samba.org/samba/ftp/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. rc
@@ -17,7 +16,7 @@ MASTER_SITE_SUBDIR=	. rc
 MAINTAINER=	dwcjr@FreeBSD.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
 
-CONFLICTS=	ja-samba-2.* samba-3.* samba-libsmbclient-3.* sharity-light-1.*
+CONFLICTS=	ja-samba-2.* samba-3.* sharity-light-1.*
 
 USE_BZIP2=	yes
 
@@ -108,7 +107,7 @@ MAN1=		findsmb.1 nmblookup.1 log2pcap.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
+MAN7=		samba.7
 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
 
diff --git a/net/samba-devel/distinfo b/net/samba-devel/distinfo
index 525e7a4cd22d..3f6023bccb27 100644
--- a/net/samba-devel/distinfo
+++ b/net/samba-devel/distinfo
@@ -1 +1 @@
-MD5 (samba-3.0.0.tar.bz2) = f54ba49f9a5ef6090272acf8db2e066d
+MD5 (samba-3.0.1.tar.bz2) = 2a3d494f139ab7402d8902b0e68c463f
diff --git a/net/samba-devel/files/patch-source_Makefile.in b/net/samba-devel/files/patch-source_Makefile.in
new file mode 100644
index 000000000000..93f130842445
--- /dev/null
+++ b/net/samba-devel/files/patch-source_Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sat Jan  3 14:45:46 2004
++++ Makefile.in	Sat Jan  3 14:50:05 2004
+@@ -1192,7 +1192,7 @@
+ 
+ bin/t_snprintf@EXEEXT@: lib/snprintf.c
+ 	$(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm
+-install: installbin installman installscripts installdat installswat installmodules @INSTALLCLIENT@
++install: installbin installman installscripts installdat installswat installmodules
+ 
+ install-everything: install installmodules
+ 
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
index 2346307dcb40..a7c2e632a6d2 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -16,6 +16,7 @@ bin/smbstatus
 bin/smbtar
 bin/smbtree
 bin/tdbbackup
+bin/tdbdump
 bin/testparm
 bin/testprns
 bin/wbinfo
@@ -27,6 +28,7 @@ etc/fr.msg
 etc/it.msg
 etc/ja.msg
 etc/lowcase.dat
+etc/nl.msg
 etc/pl.msg
 etc/rc.d/samba.sh.sample
 etc/smb.conf.default
@@ -41,39 +43,38 @@ 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
-%%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
-%%PORTDOCS%%share/doc/samba/README.FreeBSD
 %%PORTDOCS%%share/doc/samba/README
+%%PORTDOCS%%share/doc/samba/README.FreeBSD
 %%PORTDOCS%%share/doc/samba/Read-Manifest-Now
+%%PORTDOCS%%share/doc/samba/Registry/FolderRedir.adm
+%%PORTDOCS%%share/doc/samba/Registry/FolderRedir.reg
 %%PORTDOCS%%share/doc/samba/Registry/NT4-Locking.reg
 %%PORTDOCS%%share/doc/samba/Registry/NT4_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win-NT-2K-XP-DeleteRoamingProfile.reg
 %%PORTDOCS%%share/doc/samba/Registry/Win2000_PlainPassword.reg
 %%PORTDOCS%%share/doc/samba/Registry/Win95_PlainPassword.reg
 %%PORTDOCS%%share/doc/samba/Registry/Win98_PlainPassword.reg
 %%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/WinXP_SignOrSeal.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/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/history
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-Developers-Guide.html
 %%PORTDOCS%%share/doc/samba/htmldocs/AccessControls.html
 %%PORTDOCS%%share/doc/samba/htmldocs/AdvancedNetworkManagement.html
 %%PORTDOCS%%share/doc/samba/htmldocs/Appendixes.html
@@ -92,10 +93,12 @@ sbin/winbindd
 %%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-Developers-Guide.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/VFS.html
 %%PORTDOCS%%share/doc/samba/htmldocs/bugreport.html
 %%PORTDOCS%%share/doc/samba/htmldocs/compiling.html
 %%PORTDOCS%%share/doc/samba/htmldocs/diagnosis.html
@@ -104,13 +107,13 @@ sbin/winbindd
 %%PORTDOCS%%share/doc/samba/htmldocs/findsmb.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/groupmapping.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/ix01.html
+%%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.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
@@ -128,9 +131,9 @@ sbin/winbindd
 %%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-pdc.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba.7.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
@@ -158,38 +161,38 @@ sbin/winbindd
 %%PORTDOCS%%share/doc/samba/htmldocs/type.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
 %%PORTDOCS%%share/doc/samba/htmldocs/winbindd.8.html
-share/examples/samba/README
-share/examples/samba/VFS/.cvsignore
-share/examples/samba/VFS/Makefile.in
-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/README
+share/examples/samba/LDAP/convertSambaAccount
+share/examples/samba/LDAP/ldapsync.pl
+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
+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/smbldap-tools/CONTRIBUTORS
 share/examples/samba/LDAP/smbldap-tools/COPYING
-share/examples/samba/LDAP/smbldap-tools/Makefile
+share/examples/samba/LDAP/smbldap-tools/ChangeLog
 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/INSTALL
+share/examples/samba/LDAP/smbldap-tools/Makefile
 share/examples/samba/LDAP/smbldap-tools/README
 share/examples/samba/LDAP/smbldap-tools/TODO
+share/examples/samba/LDAP/smbldap-tools/cgi/README
+share/examples/samba/LDAP/smbldap-tools/cgi/ldappass.cgi
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/Makefile
+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/md4.c
+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/smbldap-groupadd.pl
 share/examples/samba/LDAP/smbldap-tools/smbldap-groupdel.pl
 share/examples/samba/LDAP/smbldap-tools/smbldap-groupmod.pl
@@ -204,18 +207,17 @@ 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/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
+share/examples/samba/README
+share/examples/samba/VFS/.cvsignore
+share/examples/samba/VFS/Makefile.in
+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/appliance/Makefile
 share/examples/samba/appliance/README
 share/examples/samba/appliance/appliance.spec
@@ -229,21 +231,23 @@ 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/testacl.c
 share/examples/samba/libsmbclient/testsmbc.c
 share/examples/samba/libsmbclient/tree.c
 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/nss/wbtest.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/sambapdb.dtd
+share/examples/samba/pdb/mysql/mysql.dump
+share/examples/samba/pdb/mysql/smb.conf
 share/examples/samba/pdb/pdb_test.c
+share/examples/samba/pdb/sambapdb.dtd
 share/examples/samba/printer-accounting/README
 share/examples/samba/printer-accounting/acct-all
 share/examples/samba/printer-accounting/acct-sum
@@ -274,7 +278,6 @@ 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
 share/swat/help/Appendixes.html
@@ -293,6 +296,7 @@ share/swat/help/PolicyMgmt.html
 share/swat/help/Portability.html
 share/swat/help/ProfileMgmt.html
 share/swat/help/SWAT.html
+share/swat/help/Samba-Developers-Guide.html
 share/swat/help/Samba-HOWTO-Collection.html
 share/swat/help/SambaHA.html
 share/swat/help/ServerType.html
@@ -313,9 +317,9 @@ 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/msdfs.html
 share/swat/help/net.8.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
@@ -324,15 +328,15 @@ share/swat/help/optional.html
 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/printing.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-pdc.html
+share/swat/help/samba.7.html
 share/swat/help/securing-samba.html
 share/swat/help/smb.conf.5.html
 share/swat/help/smbcacls.1.html
@@ -376,14 +380,6 @@ share/swat/images/wizard.gif
 share/swat/include/footer.html
 share/swat/include/header.html
 share/swat/lang/ja/help/welcome.html
-share/swat/lang/ja/images/globals.gif
-share/swat/lang/ja/images/home.gif
-share/swat/lang/ja/images/passwd.gif
-share/swat/lang/ja/images/printers.gif
-share/swat/lang/ja/images/samba.gif
-share/swat/lang/ja/images/shares.gif
-share/swat/lang/ja/images/status.gif
-share/swat/lang/ja/images/viewconfig.gif
 share/swat/lang/ja/include/footer.html
 share/swat/lang/ja/include/header.html
 share/swat/lang/ja/include/header.nocss.html
@@ -558,9 +554,9 @@ 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/toc.html
 share/swat/using_samba/samba2_s.gif
 share/swat/using_samba/samba2_xs.gif
+share/swat/using_samba/toc.html
 @dirrm etc/auth
 @dirrm etc/charset
 @dirrm etc/idmap
@@ -596,6 +592,7 @@ share/swat/using_samba/samba2_xs.gif
 @dirrm share/examples/samba/pdb
 @dirrm share/examples/samba/printer-accounting
 @dirrm share/examples/samba/ntlogon
+@dirrm share/examples/samba/nss
 @dirrm share/examples/samba/misc
 @dirrm share/examples/samba/libsmbclient
 @dirrm share/examples/samba/genlogon
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index b8f79b3d2ecf..459ea0ac93cb 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0.0
+PORTVERSION=	3.0.1
 PORTEPOCH=	1
-PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://us3.samba.org/samba/ftp/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. rc
@@ -17,7 +16,7 @@ MASTER_SITE_SUBDIR=	. rc
 MAINTAINER=	dwcjr@FreeBSD.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
 
-CONFLICTS=	ja-samba-2.* samba-3.* samba-libsmbclient-3.* sharity-light-1.*
+CONFLICTS=	ja-samba-2.* samba-3.* sharity-light-1.*
 
 USE_BZIP2=	yes
 
@@ -108,7 +107,7 @@ MAN1=		findsmb.1 nmblookup.1 log2pcap.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
+MAN7=		samba.7
 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
 
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 525e7a4cd22d..3f6023bccb27 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-3.0.0.tar.bz2) = f54ba49f9a5ef6090272acf8db2e066d
+MD5 (samba-3.0.1.tar.bz2) = 2a3d494f139ab7402d8902b0e68c463f
diff --git a/net/samba3/files/patch-source_Makefile.in b/net/samba3/files/patch-source_Makefile.in
new file mode 100644
index 000000000000..93f130842445
--- /dev/null
+++ b/net/samba3/files/patch-source_Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sat Jan  3 14:45:46 2004
++++ Makefile.in	Sat Jan  3 14:50:05 2004
+@@ -1192,7 +1192,7 @@
+ 
+ bin/t_snprintf@EXEEXT@: lib/snprintf.c
+ 	$(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm
+-install: installbin installman installscripts installdat installswat installmodules @INSTALLCLIENT@
++install: installbin installman installscripts installdat installswat installmodules
+ 
+ install-everything: install installmodules
+ 
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 2346307dcb40..a7c2e632a6d2 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -16,6 +16,7 @@ bin/smbstatus
 bin/smbtar
 bin/smbtree
 bin/tdbbackup
+bin/tdbdump
 bin/testparm
 bin/testprns
 bin/wbinfo
@@ -27,6 +28,7 @@ etc/fr.msg
 etc/it.msg
 etc/ja.msg
 etc/lowcase.dat
+etc/nl.msg
 etc/pl.msg
 etc/rc.d/samba.sh.sample
 etc/smb.conf.default
@@ -41,39 +43,38 @@ 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
-%%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
-%%PORTDOCS%%share/doc/samba/README.FreeBSD
 %%PORTDOCS%%share/doc/samba/README
+%%PORTDOCS%%share/doc/samba/README.FreeBSD
 %%PORTDOCS%%share/doc/samba/Read-Manifest-Now
+%%PORTDOCS%%share/doc/samba/Registry/FolderRedir.adm
+%%PORTDOCS%%share/doc/samba/Registry/FolderRedir.reg
 %%PORTDOCS%%share/doc/samba/Registry/NT4-Locking.reg
 %%PORTDOCS%%share/doc/samba/Registry/NT4_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win-NT-2K-XP-DeleteRoamingProfile.reg
 %%PORTDOCS%%share/doc/samba/Registry/Win2000_PlainPassword.reg
 %%PORTDOCS%%share/doc/samba/Registry/Win95_PlainPassword.reg
 %%PORTDOCS%%share/doc/samba/Registry/Win98_PlainPassword.reg
 %%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/WinXP_SignOrSeal.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/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/history
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-Developers-Guide.html
 %%PORTDOCS%%share/doc/samba/htmldocs/AccessControls.html
 %%PORTDOCS%%share/doc/samba/htmldocs/AdvancedNetworkManagement.html
 %%PORTDOCS%%share/doc/samba/htmldocs/Appendixes.html
@@ -92,10 +93,12 @@ sbin/winbindd
 %%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-Developers-Guide.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/VFS.html
 %%PORTDOCS%%share/doc/samba/htmldocs/bugreport.html
 %%PORTDOCS%%share/doc/samba/htmldocs/compiling.html
 %%PORTDOCS%%share/doc/samba/htmldocs/diagnosis.html
@@ -104,13 +107,13 @@ sbin/winbindd
 %%PORTDOCS%%share/doc/samba/htmldocs/findsmb.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/groupmapping.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/ix01.html
+%%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.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
@@ -128,9 +131,9 @@ sbin/winbindd
 %%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-pdc.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba.7.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
@@ -158,38 +161,38 @@ sbin/winbindd
 %%PORTDOCS%%share/doc/samba/htmldocs/type.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
 %%PORTDOCS%%share/doc/samba/htmldocs/winbindd.8.html
-share/examples/samba/README
-share/examples/samba/VFS/.cvsignore
-share/examples/samba/VFS/Makefile.in
-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/README
+share/examples/samba/LDAP/convertSambaAccount
+share/examples/samba/LDAP/ldapsync.pl
+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
+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/smbldap-tools/CONTRIBUTORS
 share/examples/samba/LDAP/smbldap-tools/COPYING
-share/examples/samba/LDAP/smbldap-tools/Makefile
+share/examples/samba/LDAP/smbldap-tools/ChangeLog
 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/INSTALL
+share/examples/samba/LDAP/smbldap-tools/Makefile
 share/examples/samba/LDAP/smbldap-tools/README
 share/examples/samba/LDAP/smbldap-tools/TODO
+share/examples/samba/LDAP/smbldap-tools/cgi/README
+share/examples/samba/LDAP/smbldap-tools/cgi/ldappass.cgi
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/Makefile
+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/md4.c
+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/smbldap-groupadd.pl
 share/examples/samba/LDAP/smbldap-tools/smbldap-groupdel.pl
 share/examples/samba/LDAP/smbldap-tools/smbldap-groupmod.pl
@@ -204,18 +207,17 @@ 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/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
+share/examples/samba/README
+share/examples/samba/VFS/.cvsignore
+share/examples/samba/VFS/Makefile.in
+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/appliance/Makefile
 share/examples/samba/appliance/README
 share/examples/samba/appliance/appliance.spec
@@ -229,21 +231,23 @@ 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/testacl.c
 share/examples/samba/libsmbclient/testsmbc.c
 share/examples/samba/libsmbclient/tree.c
 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/nss/wbtest.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/sambapdb.dtd
+share/examples/samba/pdb/mysql/mysql.dump
+share/examples/samba/pdb/mysql/smb.conf
 share/examples/samba/pdb/pdb_test.c
+share/examples/samba/pdb/sambapdb.dtd
 share/examples/samba/printer-accounting/README
 share/examples/samba/printer-accounting/acct-all
 share/examples/samba/printer-accounting/acct-sum
@@ -274,7 +278,6 @@ 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
 share/swat/help/Appendixes.html
@@ -293,6 +296,7 @@ share/swat/help/PolicyMgmt.html
 share/swat/help/Portability.html
 share/swat/help/ProfileMgmt.html
 share/swat/help/SWAT.html
+share/swat/help/Samba-Developers-Guide.html
 share/swat/help/Samba-HOWTO-Collection.html
 share/swat/help/SambaHA.html
 share/swat/help/ServerType.html
@@ -313,9 +317,9 @@ 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/msdfs.html
 share/swat/help/net.8.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
@@ -324,15 +328,15 @@ share/swat/help/optional.html
 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/printing.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-pdc.html
+share/swat/help/samba.7.html
 share/swat/help/securing-samba.html
 share/swat/help/smb.conf.5.html
 share/swat/help/smbcacls.1.html
@@ -376,14 +380,6 @@ share/swat/images/wizard.gif
 share/swat/include/footer.html
 share/swat/include/header.html
 share/swat/lang/ja/help/welcome.html
-share/swat/lang/ja/images/globals.gif
-share/swat/lang/ja/images/home.gif
-share/swat/lang/ja/images/passwd.gif
-share/swat/lang/ja/images/printers.gif
-share/swat/lang/ja/images/samba.gif
-share/swat/lang/ja/images/shares.gif
-share/swat/lang/ja/images/status.gif
-share/swat/lang/ja/images/viewconfig.gif
 share/swat/lang/ja/include/footer.html
 share/swat/lang/ja/include/header.html
 share/swat/lang/ja/include/header.nocss.html
@@ -558,9 +554,9 @@ 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/toc.html
 share/swat/using_samba/samba2_s.gif
 share/swat/using_samba/samba2_xs.gif
+share/swat/using_samba/toc.html
 @dirrm etc/auth
 @dirrm etc/charset
 @dirrm etc/idmap
@@ -596,6 +592,7 @@ share/swat/using_samba/samba2_xs.gif
 @dirrm share/examples/samba/pdb
 @dirrm share/examples/samba/printer-accounting
 @dirrm share/examples/samba/ntlogon
+@dirrm share/examples/samba/nss
 @dirrm share/examples/samba/misc
 @dirrm share/examples/samba/libsmbclient
 @dirrm share/examples/samba/genlogon