Index: distinfo
===================================================================
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.15
diff -N -u distinfo
--- distinfo	14 May 2009 17:05:46 -0000	1.15
+++ distinfo	11 Jun 2009 01:06:31 -0000
@@ -1,5 +1,5 @@
-MD5 (samba-3.0.34.tar.gz) = YkBPObs90KN9Y5bFfgTJBw==
-RMD160 (samba-3.0.34.tar.gz) = 15zVRLWrK0pxMLjFLBntz8iQg+o=
-SHA1 (samba-3.0.34.tar.gz) = GBBNG/UJzT/TEHwJ+mIFZm4ErBY=
-SHA256 (samba-3.0.34.tar.gz) = UweT3p9BFPSzkdky4oM7ryWgBJgxdHHNdaBo8zeMKZ4=
-SIZE (samba-3.0.34.tar.gz) = 24835363
+MD5 (samba-3.3.4.tar.gz) = FEMWXtt8s/VvHneuwe4yZg==
+RMD160 (samba-3.3.4.tar.gz) = +xb/Jn5nsS4PUiFtsBnYF+yFNsE=
+SHA1 (samba-3.3.4.tar.gz) = Rgzn5+56bGQGKh6e8AG5cwmN5wc=
+SHA256 (samba-3.3.4.tar.gz) = 8z/+aipH7lKxRB05FxjNDcyrW5H8c34MK5VoILCeJ+I=
+SIZE (samba-3.3.4.tar.gz) = 26075373
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -N -u patches/patch-Makefile_in
--- patches/patch-Makefile_in	11 Jul 2008 11:40:33 -0000	1.11
+++ patches/patch-Makefile_in	11 Jun 2009 01:06:31 -0000
@@ -1,78 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.11 2008/07/11 11:40:33 brad Exp $
---- Makefile.in.orig	Wed May 28 08:41:11 2008
-+++ Makefile.in	Fri Jul  4 00:36:10 2008
-@@ -109,11 +109,13 @@ LOCKDIR = @lockdir@
- # the directory where pid files go
- PIDDIR = @piddir@
+$OpenBSD$
+--- Makefile.in.orig	Wed Jun 10 19:32:54 2009
++++ Makefile.in	Wed Jun 10 19:33:18 2009
+@@ -25,7 +25,7 @@ SHLD=@SHLD@
+ LIB_PATH_VAR=@LIB_PATH_VAR@
  
--LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
-+LIBSMBCLIENT=bin/libsmbclient.a \
-+	@LIBSMBCLIENT_SHARED@.$(LIBsmbclient_VERSION)
- LIBSMBCLIENT_MAJOR=0
- LIBSMBCLIENT_MINOR=1
+ ## Dynamic shared libraries build settings
+-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
++DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
+ DSO_EXPORTS=@DSO_EXPORTS@
+ SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
  
--LIBMSRPC=bin/libmsrpc.a @LIBMSRPC_SHARED@
-+LIBMSRPC=bin/libmsrpc.a \
-+	@LIBMSRPC_SHARED@.$(LIBmsrpc_VERSION)
- LIBMSRPC_MAJOR=0
- LIBMSRPC_MINOR=1
- 
-@@ -125,12 +127,12 @@ LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@
- LIBADDNS_MAJOR=0
- LIBADDNS_MINOR=1
- 
--FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS)
-+FLAGS1 = @SAMBA_CPPFLAGS@ $(CFLAGS) @FLAGS1@
- FLAGS2 =
- FLAGS3 =
- FLAGS4 =
- FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
--FLAGS  = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3
-+FLAGS  = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3 $(CPPFLAGS)
- 
- PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
- PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\"
-@@ -1152,11 +1154,10 @@ bin/libaddns.a: proto_exists $(LIBADDNS_OBJ)
- 	@echo Linking libaddns non-shared library $@
- 	@-$(AR) -rc $@ $(LIBADDNS_OBJ)
- 
--bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
-+bin/libsmbclient.@SHLIBEXT@.$(LIBsmbclient_VERSION): proto_exists $(LIBSMBCLIENT_OBJ)
- 	@echo Linking libsmbclient shared library $@
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
--		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
--		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
-+		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
- 
- bin/libsmbclient.a: proto_exists $(LIBSMBCLIENT_OBJ)
- 	@echo Linking libsmbclient non-shared library $@
-@@ -1172,10 +1173,9 @@ bin/libsmbsharemodes.a: proto_exists $(LIBSMBSHAREMODE
- 	@echo Linking libsmbsharemodes non-shared library $@
- 	@-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ)
- 
--bin/libmsrpc.@SHLIBEXT@: proto_exists $(CAC_OBJ)
-+bin/libmsrpc.@SHLIBEXT@.$(LIBmsrpc_VERSION): proto_exists $(CAC_OBJ)
- 	@echo Linking libmsrpc shared library $@
--	@$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS) \
--	@SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR)
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS)
- 
- bin/libmsrpc.a: proto_exists $(CAC_OBJ)
- 	@echo Linking libmsrpc non-shared library $@
-@@ -1623,14 +1623,14 @@ installswat: installdirs installmsg
- 
- installclientlib: installdirs libsmbclient
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(LIBDIR)
--	-$(INSTALLLIBCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
-+	-$(INSTALLLIBCMD_SH) bin/libsmbclient.@SHLIBEXT@.$(LIBsmbclient_VERSION) $(DESTDIR)$(LIBDIR)
- 	-$(INSTALLLIBCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) ${prefix}/include
- 	-$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
- 
- installlibmsrpc: installdirs libmsrpc
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(LIBDIR)
--	-$(INSTALLLIBCMD_SH) bin/libmsrpc.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
-+	-$(INSTALLLIBCMD_SH) bin/libmsrpc.@SHLIBEXT@.$(LIBmsrpc_VERSION) $(DESTDIR)$(LIBDIR)
- 	-$(INSTALLLIBCMD_A) bin/libmsrpc.a $(DESTDIR)$(LIBDIR)
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) ${prefix}/include
- 	-$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include
Index: patches/patch-WHATSNEW_txt
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-WHATSNEW_txt,v
retrieving revision 1.2
diff -N -u patches/patch-WHATSNEW_txt
--- patches/patch-WHATSNEW_txt	11 Jul 2008 11:40:33 -0000	1.2
+++ /dev/null	28 Sep 2008 10:50:08 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-WHATSNEW_txt,v 1.2 2008/07/11 11:40:33 brad Exp $
---- ../WHATSNEW.txt.orig	Fri Feb  4 05:13:54 2005
-+++ ../WHATSNEW.txt	Sun Feb  6 11:33:01 2005
-@@ -8,6 +8,9 @@
- bug-fixes.  Please read the following important changes in this 
- release.
- 
-+The OpenBSD port of Samba installs the mksmbpasswd.sh script as
-+mksmbpasswd.
-+
- Common bugs fixed in 3.0.11 include:
- 
-   o Crash in smbd when using CUPS printing.
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N -u patches/patch-configure
--- /dev/null	11 Jun 2009 01:06:32 -0000
+++ patches/patch-configure	11 Jun 2009 01:06:31 -0000
@@ -0,0 +1,57 @@
+$OpenBSD$
+--- configure.orig	Wed Apr 29 04:53:51 2009
++++ configure	Wed Jun 10 20:08:34 2009
+@@ -71936,7 +71936,7 @@ LIBTALLOC_LIBS=
+ INSTALL_LIBTALLOC=
+ UNINSTALL_LIBTALLOC=
+ 
+-LIBTALLOC_SOVER=1
++LIBTALLOC_SOVER="${LIBtalloc_VERSION}"
+ 
+ 
+ 
+@@ -72020,7 +72020,7 @@ LIBTDB_LIBS=
+ INSTALL_LIBTDB=
+ UNINSTALL_LIBTDB=
+ 
+-LIBTDB_SOVER=1
++LIBTDB_SOVER="${LIBtdb_VERSION}"
+ 
+ 
+ 
+@@ -72104,7 +72104,7 @@ LIBNETAPI_LIBS=
+ INSTALL_LIBNETAPI=
+ UNINSTALL_LIBNETAPI=
+ 
+-LIBNETAPI_SOVER=0
++LIBNETAPI_SOVER="${LIBnetapi_VERSION}"
+ 
+ 
+ 
+@@ -72188,7 +72188,7 @@ LIBSMBCLIENT_LIBS=
+ INSTALL_LIBSMBCLIENT=
+ UNINSTALL_LIBSMBCLIENT=
+ 
+-LIBSMBCLIENT_SOVER=0
++LIBSMBCLIENT_SOVER="${LIBsmbclient_VERSION}"
+ 
+ 
+ 
+@@ -72272,7 +72272,7 @@ LIBSMBSHAREMODES_LIBS=
+ INSTALL_LIBSMBSHAREMODES=
+ UNINSTALL_LIBSMBSHAREMODES=
+ 
+-LIBSMBSHAREMODES_SOVER=0
++LIBSMBSHAREMODES_SOVER="${LIBsmbsharemodes_VERSION}"
+ 
+ 
+ 
+@@ -72356,7 +72356,7 @@ LIBADDNS_LIBS=
+ INSTALL_LIBADDNS=
+ UNINSTALL_LIBADDNS=
+ 
+-LIBADDNS_SOVER=0
++LIBADDNS_SOVER="${LIBaddns_VERSION}"
+ 
+ 
+ 
Index: patches/patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html,v
retrieving revision 1.3
diff -N -u patches/patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html
--- patches/patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html	11 Jul 2008 11:40:33 -0000	1.3
+++ patches/patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html	11 Jun 2009 01:06:31 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html,v 1.3 2008/07/11 11:40:33 brad Exp $
+$OpenBSD$
 --- ../docs/htmldocs/Samba3-Developers-Guide/pwencrypt.html.orig	Tue Jun 19 10:07:36 2007
 +++ ../docs/htmldocs/Samba3-Developers-Guide/pwencrypt.html	Sun Jul  1 11:39:04 2007
 @@ -1,3 +1,4 @@
 +
- <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 13. LanMan and NT Password Encryption</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.71.0"><link rel="start" href="index.html" title="SAMBA Developers Guide"><link rel="up" href="pt03.html" title="Part III. Samba Subsystems"><link rel="prev" href="wins.html" title="Chapter 12. Samba WINS Internals"><link rel="next" href="pt04.html" title="Part IV. Debugging and tracing"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 13. LanMan and NT Password Encryption</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="wins.html">Prev</a> </td><th width="60%" align="center">Part III. Samba Subsystems</th><td width="20%" align="right"> <a accesskey="n" href="pt04.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="pwencrypt"></a>Chapter 13. LanMan and NT Password Encryption</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Jeremy</span> <span class="surname">Allison</span></h3><div class="affiliation"><span class="orgname">Samba Team<br></span><div class="address"><p><br>
+ <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter?13.?LanMan and NT Password Encryption</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.71.0"><link rel="start" href="index.html" title="SAMBA Developers Guide"><link rel="up" href="pt03.html" title="Part?III.?Samba Subsystems"><link rel="prev" href="wins.html" title="Chapter?12.?Samba WINS Internals"><link rel="next" href="pt04.html" title="Part?IV.?Debugging and tracing"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter?13.?LanMan and NT Password Encryption</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="wins.html">Prev</a>?</td><th width="60%" align="center">Part?III.?Samba Subsystems</th><td width="20%" align="right">?<a accesskey="n" href="pt04.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="pwencrypt"></a>Chapter?13.?LanMan and NT Password Encryption</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Jeremy</span> <span class="surname">Allison</span></h3><div class="affiliation"><span class="orgname">Samba Team<br></span><div class="address"><p><br>
  				<code class="email">&lt;<a href="mailto:samba@samba.org">samba@samba.org</a>&gt;</code><br>
  			</p></div></div></div></div><div><p class="pubdate">19 Apr 1999</p></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="pwencrypt.html#id325949">Introduction</a></span></dt><dt><span class="sect1"><a href="pwencrypt.html#id325966">How does it work?</a></span></dt><dt><span class="sect1"><a href="pwencrypt.html#id326031">The smbpasswd file</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id325949"></a>Introduction</h2></div></div></div><p>With the development of LanManager and Windows NT 
 @@ -51,12 +52,12 @@
Index: patches/patch-docs_manpages_swat_8
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-docs_manpages_swat_8,v
retrieving revision 1.6
diff -N -u patches/patch-docs_manpages_swat_8
--- patches/patch-docs_manpages_swat_8	11 Jul 2008 11:40:33 -0000	1.6
+++ /dev/null	28 Sep 2008 10:50:08 -0000
@@ -1,80 +0,0 @@
-$OpenBSD: patch-docs_manpages_swat_8,v 1.6 2008/07/11 11:40:33 brad Exp $
---- ../docs/manpages/swat.8.orig	Thu Jul  3 22:20:31 2008
-+++ ../docs/manpages/swat.8	Thu Jul  3 22:22:36 2008
-@@ -103,49 +103,6 @@ will be appended (e\.g\. log\.smbclient, log\.smbd, et
- .RS 4
- Print a summary of command line options\.
- .RE
--.SH "INSTALLATION"
--.PP
--Swat is included as binary package with most distributions\. The package manager in this case takes care of the installation and configuration\. This section is only for those who have compiled swat from scratch\.
--.PP
--After you compile SWAT you need to run
--make install
--to install the
--swat
--binary and the various help files and images\. A default install would put these in:
--.sp
--.RS 4
--.ie n \{\
--\h'-04'\(bu\h'+03'\c
--.\}
--.el \{\
--.sp -1
--.IP \(bu 2.3
--.\}
--/usr/local/samba/sbin/swat
--.RE
--.sp
--.RS 4
--.ie n \{\
--\h'-04'\(bu\h'+03'\c
--.\}
--.el \{\
--.sp -1
--.IP \(bu 2.3
--.\}
--/usr/local/samba/swat/images/*
--.RE
--.sp
--.RS 4
--.ie n \{\
--\h'-04'\(bu\h'+03'\c
--.\}
--.el \{\
--.sp -1
--.IP \(bu 2.3
--.\}
--/usr/local/samba/swat/help/*
--.sp
--.RE
- .SS "Inetd Installation"
- .PP
- You need to edit your
-@@ -173,7 +130,7 @@ In
- \fI/etc/inetd\.conf\fR
- you should add a line like this:
- .PP
--swat stream tcp nowait\.400 root /usr/local/samba/sbin/swat swat
-+swat stream tcp nowait\.400 root ${PREFIX}/libexec/swat swat
- .PP
- Once you have edited
- \fI/etc/services\fR
-@@ -199,14 +156,12 @@ This file must contain suitable startup information fo
- This file must contain a mapping of service name (e\.g\., swat) to service port (e\.g\., 901) and protocol type (e\.g\., tcp)\.
- .RE
- .PP
--\fI/usr/local/samba/lib/smb\.conf\fR
-+\fI${SYSCONFDIR}/samba/smb\.conf\fR
- .RS 4
- This is the default location of the
- \fBsmb.conf\fR(5)
--server configuration file that swat edits\. Other common places that systems install this file are
--\fI /usr/samba/lib/smb\.conf\fR
--and
--\fI/etc/smb\.conf \fR\. This file describes all the services the server is to make available to clients\.
-+server configuration file that swat edits\.
-+This file describes all the services the server is to make available to clients\.
- .RE
- .SH "WARNINGS"
- .PP
Index: patches/patch-lib_iconv.c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-lib_iconv.c,v
retrieving revision 1.2
diff -N -u patches/patch-lib_iconv.c
--- patches/patch-lib_iconv.c	11 Jul 2008 11:40:33 -0000	1.2
+++ /dev/null	28 Sep 2008 10:50:08 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_iconv.c,v 1.2 2008/07/11 11:40:33 brad Exp $
---- lib/iconv.c.orig	Wed May 28 08:41:11 2008
-+++ lib/iconv.c	Thu Jul  3 04:19:09 2008
-@@ -137,7 +137,7 @@ static size_t sys_iconv(void *cd, 
- 			char **outbuf, size_t *outbytesleft)
- {
- 	size_t ret = iconv((iconv_t)cd, 
--			   (char **)inbuf, inbytesleft, 
-+			   inbuf, inbytesleft, 
- 			   outbuf, outbytesleft);
- 	if (ret == (size_t)-1) {
- 		int saved_errno = errno;
Index: patches/patch-lib_replace_repdir_getdirentries_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-lib_replace_repdir_getdirentries_c,v
retrieving revision 1.1
diff -N -u patches/patch-lib_replace_repdir_getdirentries_c
--- patches/patch-lib_replace_repdir_getdirentries_c	14 Dec 2007 08:53:27 -0000	1.1
+++ patches/patch-lib_replace_repdir_getdirentries_c	11 Jun 2009 01:06:31 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_replace_repdir_getdirentries_c,v 1.1 2007/12/14 08:53:27 mbalmer Exp $
---- lib/replace/repdir_getdirentries.c.orig	Thu Mar  1 05:54:23 2007
-+++ lib/replace/repdir_getdirentries.c	Thu Dec 13 22:17:06 2007
-@@ -129,11 +129,6 @@ long telldir(DIR *dir)
+$OpenBSD$
+--- lib/replace/repdir_getdirentries.c.orig	Tue Apr 28 16:46:16 2009
++++ lib/replace/repdir_getdirentries.c	Wed Jun  3 21:13:32 2009
+@@ -128,11 +128,6 @@ long telldir(DIR *dir)
  		d->ofs = 0;
  		d->nbytes = 0;
  	}
Index: patches/patch-lib_smbrun_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-lib_smbrun_c,v
retrieving revision 1.5
diff -N -u patches/patch-lib_smbrun_c
--- patches/patch-lib_smbrun_c	28 May 2007 20:03:01 -0000	1.5
+++ patches/patch-lib_smbrun_c	11 Jun 2009 01:06:31 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_smbrun_c,v 1.5 2007/05/28 20:03:01 mbalmer Exp $
---- lib/smbrun.c.orig	Fri May 11 04:32:55 2007
-+++ lib/smbrun.c	Thu May 17 10:22:53 2007
-@@ -178,7 +178,7 @@ static int smbrun_internal(const char *cmd, int *outfd
+$OpenBSD$
+--- lib/smbrun.c.orig	Tue Apr 28 16:46:16 2009
++++ lib/smbrun.c	Wed Jun  3 21:13:32 2009
+@@ -187,7 +187,7 @@ static int smbrun_internal(const char *cmd, int *outfd
  		if (!newcmd) {
  			exit(82);
  		}
@@ -10,7 +10,7 @@
  	}
  	
  	/* not reached */
-@@ -324,7 +324,7 @@ int smbrunsecret(const char *cmd, const char *secret)
+@@ -333,7 +333,7 @@ int smbrunsecret(const char *cmd, const char *secret)
  	}
  #endif
  
Index: patches/patch-libads_kerberos_keytab_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-libads_kerberos_keytab_c,v
retrieving revision 1.1
diff -N -u patches/patch-libads_kerberos_keytab_c
--- patches/patch-libads_kerberos_keytab_c	13 May 2008 11:34:12 -0000	1.1
+++ /dev/null	28 Sep 2008 10:50:08 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-libads_kerberos_keytab_c,v 1.1 2008/05/13 11:34:12 dlg Exp $
---- libads/kerberos_keytab.c.orig	Thu Nov 15 13:15:03 2007
-+++ libads/kerberos_keytab.c	Mon May 12 13:38:30 2008
-@@ -246,7 +246,7 @@ int ads_keytab_add_entry(ADS_STRUCT *ads, const char *
- 		return -1;
- 	}
- 	
--#ifdef HAVE_WRFILE_KEYTAB       /* MIT */
-+#if 0 && defined(HAVE_WRFILE_KEYTAB)       /* MIT */
- 	keytab_name[0] = 'W';
- 	keytab_name[1] = 'R';
- 	ret = krb5_kt_default_name(context, (char *) &keytab_name[2], MAX_KEYTAB_NAME_LEN - 4);
-@@ -394,7 +394,7 @@ int ads_keytab_flush(ADS_STRUCT *ads)
- 		DEBUG(1,("ads_keytab_flush: could not krb5_init_context: %s\n",error_message(ret)));
- 		return ret;
- 	}
--#ifdef HAVE_WRFILE_KEYTAB
-+#if 0 && defined(HAVE_WRFILE_KEYTAB)
- 	keytab_name[0] = 'W';
- 	keytab_name[1] = 'R';
- 	ret = krb5_kt_default_name(context, (char *) &keytab_name[2], MAX_KEYTAB_NAME_LEN - 4);
Index: patches/patch-passdb_pdb_nds_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-passdb_pdb_nds_c,v
retrieving revision 1.1
diff -N -u patches/patch-passdb_pdb_nds_c
--- patches/patch-passdb_pdb_nds_c	3 Apr 2005 11:20:38 -0000	1.1
+++ patches/patch-passdb_pdb_nds_c	11 Jun 2009 01:06:31 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-passdb_pdb_nds_c,v 1.1 2005/04/03 11:20:38 mbalmer Exp $
---- passdb/pdb_nds.c.orig	Thu Mar 31 14:46:05 2005
-+++ passdb/pdb_nds.c	Thu Mar 31 14:47:10 2005
-@@ -23,7 +23,11 @@
+$OpenBSD$
+--- passdb/pdb_nds.c.orig	Tue Apr 28 16:46:16 2009
++++ passdb/pdb_nds.c	Wed Jun  3 21:13:32 2009
+@@ -22,7 +22,11 @@
  
  #include <lber.h>
  #include <ldap.h>
Index: patches/patch-smbd_chgpasswd_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-smbd_chgpasswd_c,v
retrieving revision 1.4
diff -N -u patches/patch-smbd_chgpasswd_c
--- patches/patch-smbd_chgpasswd_c	11 Jul 2008 11:40:33 -0000	1.4
+++ patches/patch-smbd_chgpasswd_c	11 Jun 2009 01:06:31 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-smbd_chgpasswd_c,v 1.4 2008/07/11 11:40:33 brad Exp $
---- smbd/chgpasswd.c.orig	Wed May 28 08:41:11 2008
-+++ smbd/chgpasswd.c	Thu Jul  3 05:06:29 2008
-@@ -228,7 +228,7 @@ static int dochild(int master, const char *slavedev, c
+$OpenBSD$
+--- smbd/chgpasswd.c.orig	Tue Apr 28 16:46:16 2009
++++ smbd/chgpasswd.c	Wed Jun  3 21:13:32 2009
+@@ -233,7 +233,7 @@ static int dochild(int master, const char *slavedev, c
  	       passwordprogram));
  
  	/* execl() password-change application */
Index: patches/patch-smbd_utmp_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-smbd_utmp_c,v
retrieving revision 1.5
diff -N -u patches/patch-smbd_utmp_c
--- patches/patch-smbd_utmp_c	6 Apr 2007 14:20:35 -0000	1.5
+++ patches/patch-smbd_utmp_c	11 Jun 2009 01:06:31 -0000
@@ -1,64 +1,64 @@
-$OpenBSD: patch-smbd_utmp_c,v 1.5 2007/04/06 14:20:35 ajacoutot Exp $
---- smbd/utmp.c.orig	Fri Feb 25 18:59:26 2005
-+++ smbd/utmp.c	Fri Apr  6 14:46:58 2007
-@@ -245,6 +245,7 @@ static void uw_pathname(pstring fname, const char *uw_
+$OpenBSD$
+--- smbd/utmp.c.orig	Tue Apr 28 16:46:16 2009
++++ smbd/utmp.c	Wed Jun  3 21:37:53 2009
+@@ -251,14 +251,58 @@ static char *uw_pathname(TALLOC_CTX *ctx,
  }
  
  #ifndef HAVE_PUTUTLINE
 +#include <ttyent.h>
- 
++
  /****************************************************************************
   Update utmp file directly.  No subroutine interface: probably a BSD system.
-@@ -252,8 +253,50 @@ static void uw_pathname(pstring fname, const char *uw_
+ ****************************************************************************/
  
- static void pututline_my(pstring uname, struct utmp *u, BOOL claim)
+ static void pututline_my(const char *uname, struct utmp *u, bool claim)
  {
 -	DEBUG(1,("pututline_my: not yet implemented\n"));
 -	/* BSD implementor: may want to consider (or not) adjusting "lastlog" */
-+	int fd, topslot;
-+	struct utmp ubuf;
++       int fd, topslot;
++       struct utmp ubuf;
 +
-+	if ((fd = open(uname, O_RDWR, 0)) < 0)
-+		return;
++       if ((fd = open(uname, O_RDWR, 0)) < 0)
++               return;
 +
-+	if (!setttyent())
-+		return;
++       if (!setttyent())
++               return;
 +
-+	for (topslot = 0; getttyent() != (struct ttyent *)NULL; )
-+		topslot++;
++       for (topslot = 0; getttyent() != (struct ttyent *)NULL; )
++               topslot++;
 +
-+	if (!endttyent())
-+		return;
-+
-+	(void) lseek(fd, (off_t)(topslot * sizeof(struct utmp)), SEEK_SET);
-+
-+	DEBUG(1,("pututline(%s, %s, %d); topslot=%d\n",
-+	    u->ut_line, u->ut_name, claim, topslot));
-+
-+	while (1) {
-+		if (read(fd, &ubuf, sizeof(ubuf)) == sizeof(ubuf)) {
-+			if ((claim && !ubuf.ut_name[0]) ||
-+			    (!claim && ubuf.ut_name[0] &&
-+			    !strncmp(ubuf.ut_line, u->ut_line, UT_LINESIZE))) {
-+				(void) lseek(fd, -(off_t)sizeof(struct utmp),
-+				    SEEK_CUR);
-+				break;
-+			}
-+			topslot++;
-+		} else {
-+			(void) lseek(fd, (off_t)(topslot *
-+			    sizeof(struct utmp)), SEEK_SET);
-+			break;
-+		}
-+	}
-+
-+	if (!claim) {
-+		memset((char *)&u->ut_name, '\0', sizeof(u->ut_name));
-+		memset((char *)&u->ut_host, '\0', sizeof(u->ut_host));
-+	}
-+	(void) write(fd, u, sizeof(struct utmp));
-+
-+	(void) close(fd);
++      if (!endttyent())
++               return;
++               
++       (void) lseek(fd, (off_t)(topslot * sizeof(struct utmp)), SEEK_SET);
++       
++       DEBUG(1,("pututline(%s, %s, %d); topslot=%d\n",
++           u->ut_line, u->ut_name, claim, topslot));
++       
++       while (1) {
++               if (read(fd, &ubuf, sizeof(ubuf)) == sizeof(ubuf)) {
++                       if ((claim && !ubuf.ut_name[0]) ||
++                           (!claim && ubuf.ut_name[0] &&
++                           !strncmp(ubuf.ut_line, u->ut_line, UT_LINESIZE))) {
++                               (void) lseek(fd, -(off_t)sizeof(struct utmp),
++                                   SEEK_CUR);
++                               break;
++                       }
++                       topslot++;
++               } else {
++                       (void) lseek(fd, (off_t)(topslot *
++                           sizeof(struct utmp)), SEEK_SET);
++                       break;
++               }
++       }
++                                   
++       if (!claim) {
++               memset((char *)&u->ut_name, '\0', sizeof(u->ut_name));
++               memset((char *)&u->ut_host, '\0', sizeof(u->ut_host));
++       }
++       (void) write(fd, u, sizeof(struct utmp));
++                           
++       (void) close(fd);
  }
  #endif /* HAVE_PUTUTLINE */
  
Index: patches/patch-web_startstop_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-web_startstop_c,v
retrieving revision 1.2
diff -N -u patches/patch-web_startstop_c
--- patches/patch-web_startstop_c	3 Oct 2006 14:07:10 -0000	1.2
+++ patches/patch-web_startstop_c	11 Jun 2009 01:06:31 -0000
@@ -1,30 +1,30 @@
-$OpenBSD: patch-web_startstop_c,v 1.2 2006/10/03 14:07:10 mbalmer Exp $
---- web/startstop.c.orig	Thu Apr 20 04:29:28 2006
-+++ web/startstop.c	Mon Oct  2 18:38:41 2006
-@@ -38,7 +38,7 @@ void start_smbd(void)
+$OpenBSD$
+--- web/startstop.c.orig	Wed Jun  3 21:20:01 2009
++++ web/startstop.c	Wed Jun  3 21:21:18 2009
+@@ -37,7 +37,7 @@ void start_smbd(void)
  
- 	become_daemon(True, False);
- 
--	execl(binfile, binfile, "-D", NULL);
-+	execl(binfile, binfile, "-D", (void *)NULL);
- 
+ 	if (asprintf(&binfile, "%s/smbd", get_dyn_SBINDIR()) > 0) {
+ 		become_daemon(true, false);
+-		execl(binfile, binfile, "-D", NULL);
++		execl(binfile, binfile, "-D", (void *)NULL);
+ 	}
  	exit(0);
  }
-@@ -58,7 +58,7 @@ void start_nmbd(void)
- 	
- 	become_daemon(True, False);
+@@ -57,7 +57,7 @@ void start_nmbd(void)
  
--	execl(binfile, binfile, "-D", NULL);
-+	execl(binfile, binfile, "-D", (void *)NULL);
- 
+ 	if (asprintf(&binfile, "%s/nmbd", get_dyn_SBINDIR()) > 0) {
+ 		become_daemon(true, false);
+-		execl(binfile, binfile, "-D", NULL);
++		execl(binfile, binfile, "-D", (void *)NULL);
+ 	}
  	exit(0);
  }
-@@ -78,7 +78,7 @@ void start_winbindd(void)
+@@ -77,7 +77,7 @@ void start_winbindd(void)
  
- 	become_daemon(True, False);
- 
--	execl(binfile, binfile, NULL);
-+	execl(binfile, binfile, (void *)NULL);
- 
+ 	if (asprintf(&binfile, "%s/winbindd", get_dyn_SBINDIR()) > 0) {
+ 		become_daemon(true, false);
+-		execl(binfile, binfile, NULL);
++		execl(binfile, binfile, (void *)NULL);
+ 	}
  	exit(0);
  }
Index: patches/patch-web_swat_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-web_swat_c,v
retrieving revision 1.5
diff -N -u patches/patch-web_swat_c
--- patches/patch-web_swat_c	6 Apr 2007 14:20:35 -0000	1.5
+++ patches/patch-web_swat_c	11 Jun 2009 01:06:31 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-web_swat_c,v 1.5 2007/04/06 14:20:35 ajacoutot Exp $
---- web/swat.c.orig	Sun Feb  4 19:59:21 2007
-+++ web/swat.c	Fri Apr  6 14:46:58 2007
-@@ -136,8 +136,10 @@ static int include_html(const char *fname)
+$OpenBSD$
+--- web/swat.c.orig	Tue Apr 28 16:46:16 2009
++++ web/swat.c	Wed Jun  3 21:13:32 2009
+@@ -150,8 +150,10 @@ static int include_html(const char *fname)
  	fd = web_open(fname, O_RDONLY, 0);
  
  	if (fd == -1) {
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PFRAG.shared-main,v
retrieving revision 1.2
diff -N -u pkg/PFRAG.shared-main
--- pkg/PFRAG.shared-main	28 May 2007 20:03:01 -0000	1.2
+++ pkg/PFRAG.shared-main	11 Jun 2009 01:06:31 -0000
@@ -1,14 +1,24 @@
 @comment $OpenBSD: PFRAG.shared-main,v 1.2 2007/05/28 20:03:01 mbalmer Exp $
-@lib lib/libmsrpc.so.${LIBmsrpc_VERSION}
+@lib lib/libnetapi.so.${LIBnetapi_VERSION}
 @lib lib/libsmbclient.so.${LIBsmbclient_VERSION}
+@lib lib/libsmbsharemodes.so.${LIBsmbsharemodes_VERSION}
+@lib lib/libtalloc.so.${LIBtalloc_VERSION}
+@lib lib/libtdb.so.${LIBtdb_VERSION}
 lib/samba/auth/script.so
-lib/samba/charset/
 lib/samba/charset/CP437.so
 lib/samba/charset/CP850.so
-@lib lib/samba/libmsrpc.so.${LIBmsrpc_VERSION}
+lib/samba/libnetapi.so
+@lib lib/samba/libnetapi.so.${LIBnetapi_VERSION}
+lib/samba/libsmbclient.so
 @lib lib/samba/libsmbclient.so.${LIBsmbclient_VERSION}
 lib/samba/libsmbsharemodes.so
-lib/samba/vfs/
+@lib lib/samba/libsmbsharemodes.so.${LIBsmbsharemodes_VERSION}
+lib/samba/libtalloc.so
+@lib lib/samba/libtalloc.so.${LIBtalloc_VERSION}
+lib/samba/libtdb.so
+@lib lib/samba/libtdb.so.${LIBtdb_VERSION}
+lib/samba/vfs/acl_tdb.so
+lib/samba/vfs/acl_xattr.so
 lib/samba/vfs/audit.so
 lib/samba/vfs/cap.so
 lib/samba/vfs/default_quota.so
@@ -17,7 +27,13 @@
 lib/samba/vfs/fake_perms.so
 lib/samba/vfs/full_audit.so
 lib/samba/vfs/netatalk.so
+lib/samba/vfs/preopen.so
 lib/samba/vfs/readahead.so
 lib/samba/vfs/readonly.so
 lib/samba/vfs/recycle.so
 lib/samba/vfs/shadow_copy.so
+lib/samba/vfs/shadow_copy2.so
+lib/samba/vfs/smb_traffic_analyzer.so
+lib/samba/vfs/streams_depot.so
+lib/samba/vfs/streams_xattr.so
+lib/samba/vfs/xattr_tdb.so
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-docs,v
retrieving revision 1.13
diff -N -u pkg/PLIST-docs
--- pkg/PLIST-docs	14 May 2009 17:05:46 -0000	1.13
+++ pkg/PLIST-docs	11 Jun 2009 01:06:32 -0000
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST-docs,v 1.13 2009/05/14 17:05:46 giovanni Exp $
-@conflict samba-<=3.0.31p0
+@comment $OpenBSD: PLIST-docs,v 1.12 2008/12/07 03:52:56 brad Exp $
+@conflict samba-<=3.3.4
 share/doc/samba/
 share/doc/samba/NT4-Locking.reg
 share/doc/samba/NT4_PlainPassword.reg
@@ -25,7 +25,9 @@
 share/examples/samba/LDAP/README
 share/examples/samba/LDAP/convertSambaAccount
 share/examples/samba/LDAP/get_next_oid
+share/examples/samba/LDAP/ol-schema-migrate.pl
 share/examples/samba/LDAP/samba-nds.schema
+share/examples/samba/LDAP/samba-schema-FDS.ldif
 share/examples/samba/LDAP/samba-schema-netscapeds4.x
 share/examples/samba/LDAP/samba-schema-netscapeds5.x
 share/examples/samba/LDAP/samba-schema.IBMSecureWay
@@ -55,54 +57,9 @@
 share/examples/samba/dce-dfs/
 share/examples/samba/dce-dfs/README
 share/examples/samba/dce-dfs/smb.conf
-share/examples/samba/libmsrpc/
-share/examples/samba/libmsrpc/cacusermgr/
-share/examples/samba/libmsrpc/cacusermgr/Makefile
-share/examples/samba/libmsrpc/cacusermgr/cacusermgr.c
-share/examples/samba/libmsrpc/cacusermgr/cacusermgr.h
-share/examples/samba/libmsrpc/cacusermgr/mgr_group.c
-share/examples/samba/libmsrpc/cacusermgr/mgr_user.c
-share/examples/samba/libmsrpc/cacusermgr/util.c
-share/examples/samba/libmsrpc/test/
-share/examples/samba/libmsrpc/test/Makefile
-share/examples/samba/libmsrpc/test/README
-share/examples/samba/libmsrpc/test/lsa/
-share/examples/samba/libmsrpc/test/lsa/ear.c
-share/examples/samba/libmsrpc/test/lsa/lsaenum.c
-share/examples/samba/libmsrpc/test/lsa/lsaenumprivs.c
-share/examples/samba/libmsrpc/test/lsa/lsapol.c
-share/examples/samba/libmsrpc/test/lsa/lsapriv.c
-share/examples/samba/libmsrpc/test/lsa/lsaq.c
-share/examples/samba/libmsrpc/test/lsa/lsatrust.c
-share/examples/samba/libmsrpc/test/reg/
-share/examples/samba/libmsrpc/test/reg/regdelete.c
-share/examples/samba/libmsrpc/test/reg/regkey.c
-share/examples/samba/libmsrpc/test/reg/regkeycreate.c
-share/examples/samba/libmsrpc/test/reg/regkeyenum.c
-share/examples/samba/libmsrpc/test/reg/regopen.c
-share/examples/samba/libmsrpc/test/reg/regopenkey.c
-share/examples/samba/libmsrpc/test/reg/regqueryval.c
-share/examples/samba/libmsrpc/test/reg/regsetval.c
-share/examples/samba/libmsrpc/test/reg/regvalenum.c
-share/examples/samba/libmsrpc/test/reg/security.c
-share/examples/samba/libmsrpc/test/reg/shutdown.c
-share/examples/samba/libmsrpc/test/sam/
-share/examples/samba/libmsrpc/test/sam/adduser.c
-share/examples/samba/libmsrpc/test/sam/disable.c
-share/examples/samba/libmsrpc/test/sam/dominfo.c
-share/examples/samba/libmsrpc/test/sam/enable.c
-share/examples/samba/libmsrpc/test/sam/samenum.c
-share/examples/samba/libmsrpc/test/sam/samgroup.c
-share/examples/samba/libmsrpc/test/sam/samlookup.c
-share/examples/samba/libmsrpc/test/sam/samuser.c
-share/examples/samba/libmsrpc/test/smbc_test/
-share/examples/samba/libmsrpc/test/smbc_test/smbc.c
-share/examples/samba/libmsrpc/test/svcctl/
-share/examples/samba/libmsrpc/test/svcctl/svc.c
-share/examples/samba/libmsrpc/test/test_util.c
-share/examples/samba/libmsrpc/test/test_util.h
 share/examples/samba/libsmbclient/
 share/examples/samba/libsmbclient/Makefile
+share/examples/samba/libsmbclient/Makefile.internal.in
 share/examples/samba/libsmbclient/README
 share/examples/samba/libsmbclient/get_auth_data_fn.h
 share/examples/samba/libsmbclient/smbwrapper/
@@ -125,14 +82,21 @@
 share/examples/samba/libsmbclient/smbwrapper/wrapper.h
 share/examples/samba/libsmbclient/testacl.c
 share/examples/samba/libsmbclient/testacl2.c
+share/examples/samba/libsmbclient/testacl3.c
 share/examples/samba/libsmbclient/testbrowse.c
 share/examples/samba/libsmbclient/testbrowse2.c
 share/examples/samba/libsmbclient/testchmod.c
+share/examples/samba/libsmbclient/testctx.c
+share/examples/samba/libsmbclient/testfstatvfs.c
 share/examples/samba/libsmbclient/testread.c
 share/examples/samba/libsmbclient/testsmbc.c
 share/examples/samba/libsmbclient/teststat.c
 share/examples/samba/libsmbclient/teststat2.c
+share/examples/samba/libsmbclient/teststat3.c
+share/examples/samba/libsmbclient/teststatvfs.c
+share/examples/samba/libsmbclient/testtruncate.c
 share/examples/samba/libsmbclient/testutime.c
+share/examples/samba/libsmbclient/testwrite.c
 share/examples/samba/libsmbclient/tree.c
 share/examples/samba/logon/
 share/examples/samba/logon/genlogon/
@@ -217,6 +181,8 @@
 share/examples/samba/scripts/debugging/solaris/solaris-oops.sh
 share/examples/samba/scripts/eventlog/
 share/examples/samba/scripts/eventlog/parselog.pl
+share/examples/samba/scripts/mount/
+share/examples/samba/scripts/mount/mount.smbfs
 share/examples/samba/scripts/printing/
 share/examples/samba/scripts/printing/cups/
 share/examples/samba/scripts/printing/cups/smbaddprinter.pl
@@ -230,6 +196,9 @@
 share/examples/samba/scripts/shares/python/generate_parm_table.py
 share/examples/samba/scripts/shares/python/modify_samba_config.py
 share/examples/samba/scripts/shares/python/smbparm.py
+share/examples/samba/scripts/users_and_groups/
+share/examples/samba/scripts/users_and_groups/adduserstogroups.pl
+share/examples/samba/scripts/users_and_groups/createdomobj.pl
 share/examples/samba/scripts/wins_hook/
 share/examples/samba/scripts/wins_hook/README
 share/examples/samba/scripts/wins_hook/dns_update
@@ -451,6 +420,7 @@
 share/swat/help/Samba3-HOWTO/samba-pdc.html
 share/swat/help/Samba3-HOWTO/securing-samba.html
 share/swat/help/Samba3-HOWTO/speed.html
+share/swat/help/Samba3-HOWTO/tdb.html
 share/swat/help/Samba3-HOWTO/troubleshooting.html
 share/swat/help/Samba3-HOWTO/type.html
 share/swat/help/Samba3-HOWTO/unicode.html
@@ -461,11 +431,21 @@
 share/swat/help/manpages/eventlogadm.8.html
 share/swat/help/manpages/findsmb.1.html
 share/swat/help/manpages/idmap_ad.8.html
+share/swat/help/manpages/idmap_adex.8.html
+share/swat/help/manpages/idmap_hash.8.html
 share/swat/help/manpages/idmap_ldap.8.html
 share/swat/help/manpages/idmap_nss.8.html
 share/swat/help/manpages/idmap_rid.8.html
 share/swat/help/manpages/idmap_tdb.8.html
+share/swat/help/manpages/idmap_tdb2.8.html
 share/swat/help/manpages/index.html
+share/swat/help/manpages/ldb.3.html
+share/swat/help/manpages/ldbadd.1.html
+share/swat/help/manpages/ldbdel.1.html
+share/swat/help/manpages/ldbedit.1.html
+share/swat/help/manpages/ldbmodify.1.html
+share/swat/help/manpages/ldbrename.1.html
+share/swat/help/manpages/ldbsearch.1.html
 share/swat/help/manpages/libsmbclient.7.html
 share/swat/help/manpages/lmhosts.5.html
 share/swat/help/manpages/log2pcap.1.html
@@ -479,6 +459,7 @@
 share/swat/help/manpages/profiles.1.html
 share/swat/help/manpages/rpcclient.1.html
 share/swat/help/manpages/samba.7.html
+share/swat/help/manpages/sharesec.1.html
 share/swat/help/manpages/smb.conf.5.html
 share/swat/help/manpages/smbcacls.1.html
 share/swat/help/manpages/smbclient.1.html
@@ -487,41 +468,48 @@
 share/swat/help/manpages/smbd.8.html
 share/swat/help/manpages/smbget.1.html
 share/swat/help/manpages/smbgetrc.5.html
-share/swat/help/manpages/smbmnt.8.html
-share/swat/help/manpages/smbmount.8.html
 share/swat/help/manpages/smbpasswd.5.html
 share/swat/help/manpages/smbpasswd.8.html
 share/swat/help/manpages/smbspool.8.html
 share/swat/help/manpages/smbstatus.1.html
 share/swat/help/manpages/smbtar.1.html
 share/swat/help/manpages/smbtree.1.html
-share/swat/help/manpages/smbumount.8.html
 share/swat/help/manpages/swat.8.html
 share/swat/help/manpages/tdbbackup.8.html
 share/swat/help/manpages/tdbdump.8.html
 share/swat/help/manpages/tdbtool.8.html
 share/swat/help/manpages/testparm.1.html
 share/swat/help/manpages/umount.cifs.8.html
+share/swat/help/manpages/vfs_acl_tdb.8.html
+share/swat/help/manpages/vfs_acl_xattr.8.html
 share/swat/help/manpages/vfs_audit.8.html
 share/swat/help/manpages/vfs_cacheprime.8.html
 share/swat/help/manpages/vfs_cap.8.html
 share/swat/help/manpages/vfs_catia.8.html
 share/swat/help/manpages/vfs_commit.8.html
 share/swat/help/manpages/vfs_default_quota.8.html
+share/swat/help/manpages/vfs_dirsort.8.html
 share/swat/help/manpages/vfs_extd_audit.8.html
 share/swat/help/manpages/vfs_fake_perms.8.html
+share/swat/help/manpages/vfs_fileid.8.html
 share/swat/help/manpages/vfs_full_audit.8.html
 share/swat/help/manpages/vfs_gpfs.8.html
 share/swat/help/manpages/vfs_netatalk.8.html
 share/swat/help/manpages/vfs_notify_fam.8.html
 share/swat/help/manpages/vfs_prealloc.8.html
+share/swat/help/manpages/vfs_preopen.8.html
 share/swat/help/manpages/vfs_readahead.8.html
 share/swat/help/manpages/vfs_readonly.8.html
 share/swat/help/manpages/vfs_recycle.8.html
 share/swat/help/manpages/vfs_shadow_copy.8.html
+share/swat/help/manpages/vfs_shadow_copy2.8.html
+share/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
+share/swat/help/manpages/vfs_streams_depot.8.html
+share/swat/help/manpages/vfs_streams_xattr.8.html
 share/swat/help/manpages/vfs_xattr_tdb.8.html
 share/swat/help/manpages/vfstest.1.html
 share/swat/help/manpages/wbinfo.1.html
+share/swat/help/manpages/winbind_krb5_locator.7.html
 share/swat/help/manpages/winbindd.8.html
 share/swat/help/welcome.html
 @comment share/swat/js/
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.9
diff -N -u pkg/PLIST-main
--- pkg/PLIST-main	14 May 2009 17:05:46 -0000	1.9
+++ pkg/PLIST-main	11 Jun 2009 01:06:32 -0000
@@ -1,8 +1,14 @@
-@comment $OpenBSD: PLIST-main,v 1.9 2009/05/14 17:05:46 giovanni Exp $
-@conflict samba-docs-<=3.0.31p1
+@comment $OpenBSD: PLIST-main,v 1.8 2008/09/12 07:49:11 brad Exp $
+@conflict samba-docs-<=3.3.4
 @pkgpath ${BASE_PKGPATH}
 bin/eventlogadm
 bin/findsmb
+bin/ldbadd
+bin/ldbdel
+bin/ldbedit
+bin/ldbmodify
+bin/ldbrename
+bin/ldbsearch
 bin/mksmbpasswd
 bin/net
 bin/nmblookup
@@ -10,6 +16,7 @@
 bin/pdbedit
 bin/profiles
 bin/rpcclient
+bin/sharesec
 bin/smbcacls
 bin/smbclient
 bin/smbcontrol
@@ -24,14 +31,19 @@
 bin/tdbdump
 bin/tdbtool
 bin/testparm
-include/libmsrpc.h
 include/libsmbclient.h
+include/netapi.h
+include/smb_share_modes.h
+include/talloc.h
+include/tdb.h
 lib/samba/
 lib/samba/auth/
+lib/samba/charset/
 lib/samba/de.msg
 lib/samba/en.msg
 lib/samba/fi.msg
 lib/samba/fr.msg
+lib/samba/gpext/
 lib/samba/idmap/
 lib/samba/it.msg
 lib/samba/ja.msg
@@ -44,15 +56,23 @@
 lib/samba/tr.msg
 lib/samba/upcase.dat
 lib/samba/valid.dat
+lib/samba/vfs/
 libexec/nmbd
 libexec/smbd
 libexec/swat
 @man man/man1/findsmb.1
+@man man/man1/ldbadd.1
+@man man/man1/ldbdel.1
+@man man/man1/ldbedit.1
+@man man/man1/ldbmodify.1
+@man man/man1/ldbrename.1
+@man man/man1/ldbsearch.1
 @man man/man1/log2pcap.1
 @man man/man1/nmblookup.1
 @man man/man1/ntlm_auth.1
 @man man/man1/profiles.1
 @man man/man1/rpcclient.1
+@man man/man1/sharesec.1
 @man man/man1/smbcacls.1
 @man man/man1/smbclient.1
 @man man/man1/smbcontrol.1
@@ -71,13 +91,16 @@
 @man man/man7/libsmbclient.7
 @man man/man7/pam_winbind.7
 @man man/man7/samba.7
-@man man/man8/cifs.upcall.8
+@man man/man7/winbind_krb5_locator.7
 @man man/man8/eventlogadm.8
 @man man/man8/idmap_ad.8
+@man man/man8/idmap_adex.8
+@man man/man8/idmap_hash.8
 @man man/man8/idmap_ldap.8
 @man man/man8/idmap_nss.8
 @man man/man8/idmap_rid.8
 @man man/man8/idmap_tdb.8
+@man man/man8/idmap_tdb2.8
 @man man/man8/mount.cifs.8
 @man man/man8/net.8
 @man man/man8/nmbd.8
@@ -90,23 +113,32 @@
 @man man/man8/tdbdump.8
 @man man/man8/tdbtool.8
 @man man/man8/umount.cifs.8
+@man man/man8/vfs_acl_tdb.8
+@man man/man8/vfs_acl_xattr.8
 @man man/man8/vfs_audit.8
 @man man/man8/vfs_cacheprime.8
 @man man/man8/vfs_cap.8
 @man man/man8/vfs_catia.8
 @man man/man8/vfs_commit.8
 @man man/man8/vfs_default_quota.8
+@man man/man8/vfs_dirsort.8
 @man man/man8/vfs_extd_audit.8
 @man man/man8/vfs_fake_perms.8
+@man man/man8/vfs_fileid.8
 @man man/man8/vfs_full_audit.8
 @man man/man8/vfs_gpfs.8
 @man man/man8/vfs_netatalk.8
 @man man/man8/vfs_notify_fam.8
 @man man/man8/vfs_prealloc.8
+@man man/man8/vfs_preopen.8
 @man man/man8/vfs_readahead.8
 @man man/man8/vfs_readonly.8
 @man man/man8/vfs_recycle.8
 @man man/man8/vfs_shadow_copy.8
+@man man/man8/vfs_shadow_copy2.8
+@man man/man8/vfs_smb_traffic_analyzer.8
+@man man/man8/vfs_streams_depot.8
+@man man/man8/vfs_streams_xattr.8
 @man man/man8/vfs_xattr_tdb.8
 @man man/man8/winbindd.8
 share/doc/samba/README
@@ -115,6 +147,10 @@
 @sample ${SYSCONFDIR}/samba/
 share/examples/samba/smb.conf.default
 @sample ${SYSCONFDIR}/samba/smb.conf
+share/locale/
+share/locale/de/
+share/locale/de/LC_MESSAGES/
+share/locale/de/LC_MESSAGES/pam_winbind.mo
 share/swat/
 share/swat/help/
 share/swat/help/welcome-no-samba-doc.html
