3 files changed, 130 insertions, 7 deletions

diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index ef26b98afad..602dba0cad0 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/05/02 14:50:19 taca Exp $
+# $NetBSD: Makefile,v 1.21 2012/07/07 12:35:53 asau Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.samba.org/
 COMMENT=	SMB/CIFS protocol server suite
 LICENSE=	gnu-gpl-v3
 
-VERSION=	3.5.15
+VERSION=	3.5.16
 CONFLICTS+=	ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/net/samba35/PLIST b/net/samba35/PLIST
index c7f8bea10d2..414ced53a9a 100644
--- a/net/samba35/PLIST
+++ b/net/samba35/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/02/01 08:32:01 sbd Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/07/07 12:35:53 asau Exp $
 bin/eventlogadm
 bin/findsmb
 bin/ldbadd
@@ -244,6 +244,60 @@ share/samba/swat/help/Samba3-ByExample/appendix.html
 share/samba/swat/help/Samba3-ByExample/ch14.html
 share/samba/swat/help/Samba3-ByExample/go01.html
 share/samba/swat/help/Samba3-ByExample/happy.html
+share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png
+share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
+share/samba/swat/help/Samba3-ByExample/images/Domain-WorkgroupAnnouncement.png
+share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png
+share/samba/swat/help/Samba3-ByExample/images/LocalMasterAnnouncement.png
+share/samba/swat/help/Samba3-ByExample/images/NullConnect.png
+share/samba/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
+share/samba/swat/help/Samba3-ByExample/images/UserConnect.png
+share/samba/swat/help/Samba3-ByExample/images/UserMgrNT4.png
+share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
+share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
+share/samba/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
+share/samba/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
+share/samba/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
+share/samba/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
+share/samba/swat/help/Samba3-ByExample/images/XP-screen001.png
+share/samba/swat/help/Samba3-ByExample/images/acct2net.png
+share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
+share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
+share/samba/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
+share/samba/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
+share/samba/swat/help/Samba3-ByExample/images/ch8-migration.png
+share/samba/swat/help/Samba3-ByExample/images/chap4-net.png
+share/samba/swat/help/Samba3-ByExample/images/chap5-net.png
+share/samba/swat/help/Samba3-ByExample/images/chap6-net.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-idresol.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net-A.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net2-B.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net2.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-net2r.png
+share/samba/swat/help/Samba3-ByExample/images/chap7-netr.png
+share/samba/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
+share/samba/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
+share/samba/swat/help/Samba3-ByExample/images/imc-usermanager2.png
+share/samba/swat/help/Samba3-ByExample/images/lam-config.png
+share/samba/swat/help/Samba3-ByExample/images/lam-group-members.png
+share/samba/swat/help/Samba3-ByExample/images/lam-groups.png
+share/samba/swat/help/Samba3-ByExample/images/lam-hosts.png
+share/samba/swat/help/Samba3-ByExample/images/lam-login.png
+share/samba/swat/help/Samba3-ByExample/images/lam-users.png
+share/samba/swat/help/Samba3-ByExample/images/openmag.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp001.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp004.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp006.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp007.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp008.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp010.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp011.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp012.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp013.png
+share/samba/swat/help/Samba3-ByExample/images/wxpp015.png
 share/samba/swat/help/Samba3-ByExample/index.html
 share/samba/swat/help/Samba3-ByExample/ix01.html
 share/samba/swat/help/Samba3-ByExample/kerberos.html
@@ -319,6 +373,74 @@ share/samba/swat/help/Samba3-HOWTO/domain-member.html
 share/samba/swat/help/Samba3-HOWTO/go01.html
 share/samba/swat/help/Samba3-HOWTO/groupmapping.html
 share/samba/swat/help/Samba3-HOWTO/idmapper.html
+share/samba/swat/help/Samba3-HOWTO/images/10small.png
+share/samba/swat/help/Samba3-HOWTO/images/11small.png
+share/samba/swat/help/Samba3-HOWTO/images/12small.png
+share/samba/swat/help/Samba3-HOWTO/images/13small.png
+share/samba/swat/help/Samba3-HOWTO/images/14small.png
+share/samba/swat/help/Samba3-HOWTO/images/1small.png
+share/samba/swat/help/Samba3-HOWTO/images/2small.png
+share/samba/swat/help/Samba3-HOWTO/images/3small.png
+share/samba/swat/help/Samba3-HOWTO/images/4small.png
+share/samba/swat/help/Samba3-HOWTO/images/5small.png
+share/samba/swat/help/Samba3-HOWTO/images/6small.png
+share/samba/swat/help/Samba3-HOWTO/images/7small.png
+share/samba/swat/help/Samba3-HOWTO/images/8small.png
+share/samba/swat/help/Samba3-HOWTO/images/9small.png
+share/samba/swat/help/Samba3-HOWTO/images/WME001.png
+share/samba/swat/help/Samba3-HOWTO/images/WME002.png
+share/samba/swat/help/Samba3-HOWTO/images/WME003.png
+share/samba/swat/help/Samba3-HOWTO/images/WME004.png
+share/samba/swat/help/Samba3-HOWTO/images/WME005.png
+share/samba/swat/help/Samba3-HOWTO/images/WME006.png
+share/samba/swat/help/Samba3-HOWTO/images/WME007.png
+share/samba/swat/help/Samba3-HOWTO/images/WME008.png
+share/samba/swat/help/Samba3-HOWTO/images/WME009.png
+share/samba/swat/help/Samba3-HOWTO/images/WME010.png
+share/samba/swat/help/Samba3-HOWTO/images/WME011.png
+share/samba/swat/help/Samba3-HOWTO/images/WME012.png
+share/samba/swat/help/Samba3-HOWTO/images/WME013.png
+share/samba/swat/help/Samba3-HOWTO/images/WME014.png
+share/samba/swat/help/Samba3-HOWTO/images/WXPP002.png
+share/samba/swat/help/Samba3-HOWTO/images/WXPP003.png
+share/samba/swat/help/Samba3-HOWTO/images/WXPP005.png
+share/samba/swat/help/Samba3-HOWTO/images/WXPP009.png
+share/samba/swat/help/Samba3-HOWTO/images/WXPP014.png
+share/samba/swat/help/Samba3-HOWTO/images/a_small.png
+share/samba/swat/help/Samba3-HOWTO/images/access1.png
+share/samba/swat/help/Samba3-HOWTO/images/browsing1.png
+share/samba/swat/help/Samba3-HOWTO/images/cups1.png
+share/samba/swat/help/Samba3-HOWTO/images/cups2.png
+share/samba/swat/help/Samba3-HOWTO/images/domain.png
+share/samba/swat/help/Samba3-HOWTO/images/ethereal1.png
+share/samba/swat/help/Samba3-HOWTO/images/ethereal2.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-groups.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap.png
+share/samba/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
+share/samba/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
+share/samba/swat/help/Samba3-HOWTO/images/pdftosocket.png
+share/samba/swat/help/Samba3-HOWTO/images/trusts1.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp001.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp002.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp003.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp004.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp005.png
+share/samba/swat/help/Samba3-HOWTO/images/w2kp006.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp001.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp004.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp006.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp007.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp008.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp010.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp011.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp012.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp013.png
+share/samba/swat/help/Samba3-HOWTO/images/wxpp015.png
 share/samba/swat/help/Samba3-HOWTO/index.html
 share/samba/swat/help/Samba3-HOWTO/install.html
 share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html
@@ -402,6 +524,7 @@ share/samba/swat/help/manpages/testparm.1.html
 share/samba/swat/help/manpages/umount.cifs.8.html
 share/samba/swat/help/manpages/vfs_acl_tdb.8.html
 share/samba/swat/help/manpages/vfs_acl_xattr.8.html
+share/samba/swat/help/manpages/vfs_aio_fork.8.html
 share/samba/swat/help/manpages/vfs_audit.8.html
 share/samba/swat/help/manpages/vfs_cacheprime.8.html
 share/samba/swat/help/manpages/vfs_cap.8.html
diff --git a/net/samba35/distinfo b/net/samba35/distinfo
index c133937c66c..02568d0150e 100644
--- a/net/samba35/distinfo
+++ b/net/samba35/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2012/05/02 14:50:19 taca Exp $
+$NetBSD: distinfo,v 1.13 2012/07/07 12:35:53 asau Exp $
 
-SHA1 (samba-3.5.15.tar.gz) = 4259bcfe9c03ff74bbe6c5133a53bd15f3f4f172
-RMD160 (samba-3.5.15.tar.gz) = 18d2ff1f59b445a9203fda2ec06c88285df15433
-Size (samba-3.5.15.tar.gz) = 30368870 bytes
+SHA1 (samba-3.5.16.tar.gz) = ba25360232a8006c9a00384c9588e8a51709edab
+RMD160 (samba-3.5.16.tar.gz) = 5372ea79286787e410c2f8985180bf856e064283
+Size (samba-3.5.16.tar.gz) = 35367569 bytes
 SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
 SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
 SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032