6 files changed, 462 insertions, 453 deletions

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 4e087ed2bb09..dddea6e979ab 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0.1
-PORTREVISION=	2
+PORTVERSION=	3.0.2a
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://us3.samba.org/samba/ftp/%SUBDIR%/
@@ -20,6 +19,8 @@ COMMENT=	A free SMB and CIFS client and server for UNIX
 CONFLICTS=	ja-samba-2.* samba-3.* sharity-light-1.*
 
 USE_BZIP2=	yes
+USE_SIZE=	yes
+USE_RC_SUBR=	yes
 
 .if !defined(WITHOUT_CUPS)
 WITH_CUPS=	yes
@@ -36,30 +37,88 @@ CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 # directories
 VARDIR=		/var
 SAMBA_SPOOL=	${VARDIR}/spool/samba
-SAMBA_LOGDIR=	${VARDIR}/log
-SAMBA_PRIVATE=	${PREFIX}/private
-SAMBA_CONFDIR=	${PREFIX}/etc
+SAMBA_LOCKDIR?=	${VARDIR}/lock
+SAMBA_LOGDIR?=	${VARDIR}/log
+SAMBA_PRIVATE?=	${PREFIX}/private
+SAMBA_CONFDIR?=	${PREFIX}/etc
 # sample files
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
+STARTUP_SCRIPT=	${LOCALBASE}/etc/rc.d/samba.sh.sample
 SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
 DOCSDIR=	${PREFIX}/share/doc/samba
 
 NO_LATEST_LINK=	yes
 USE_AUTOCONF=	yes
 WANT_AUTOCONF_VER=	253
-CONFIGURE_ARGS+=--libdir=${SAMBA_CONFDIR} \
+CONFIGURE_ARGS=	--libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
-		--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE} \
+		--with-lockdir=${SAMBA_LOCKDIR} \
+		--with-privatedir=${SAMBA_PRIVATE} \
 		--exec-prefix=${PREFIX} --with-pam --without-manpages-langs \
-		--with-piddir=${VARDIR}/run --with-logfilebase=${VARDIR}/log
+		--with-piddir=${VARDIR}/run --with-logfilebase=${SAMBA_LOGDIR} \
+		--with-configdir=${SAMBA_CONFDIR}
+
+PLIST_SUB=	SAMBA_CONFDIR=${SAMBA_CONFDIR} \
+		SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
+		SAMBA_SPOOL=${SAMBA_SPOOL} \
+		PYTHON_VERSION=${PYTHON_VERSION}
+
+.if defined(WITH_PYTHON)
+USE_PYTHON=	2.1+
+CONFIGURE_ARGS+=	--with-python
+PLIST_SUB+=	PYTHON=""
+.else
+PLIST_SUB+=	PYTHON="@comment "
+.endif
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_LDAP_COMPAT)
+.ifndef(WITH_LDAP)
+USE_OPENLDAP_VER?=	21
+CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib
+.endif
+CONFIGURE_ARGS+=	--with-ldapsam
+.endif
+
+.if defined(WITH_LDAP)
+.ifndef(WITH_LDAP_COMPAT)
+USE_OPENLDAP_VER?=	21
+CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib
+.endif
+CONFIGURE_ARGS+=	--with-ldap
+.endif
+
+.if defined(WITH_LDAP) && defined(WITH_LDAP_COMPAT)
+USE_OPENLDAP_VER?=	21
+CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib
+.endif
+
+.if defined(WITH_ADS)
+.ifndef(KRB5_HOME)
+BROKEN=		"Needs KRB5_HOME=/path/to/Kerberos5_prefix"
+.endif
+.ifndef(WITH_LDAP) && !defined(WITH_LDAP_COMPAT)
+BROKEN=		"Needs WITH_LDAP=yes or WITH_LDAP_COMPAT=yes"
+.endif
+CONFIGURE_ARGS+=	--with-ads
+.endif
+
+.if defined(WITH_SYSLOG)
+CONFIGURE_ARGS+=	--with-syslog
+.endif
+
 .if defined(WITH_QUOTAS)
 CONFIGURE_ARGS+=	--with-quotas
 .endif
 
+.if defined(WITH_SYS_QUOTAS)
+CONFIGURE_ARGS+=	--with-sys-quotas
+.endif
+
 .if defined(WITH_UTMP)
 CONFIGURE_ARGS+=	--with-utmp
 .endif
@@ -70,10 +129,10 @@ CONFIGURE_ARGS+=	--with-msdfs
 
 .if defined(WITH_WINBIND)
 CONFIGURE_ARGS+=	--with-winbind
-.endif
-
-.if defined(WITH_WINBIND_AUTH_CHALLENGE)
-CONFIGURE_ARGS+=	--with-winbind-auth-challenge
+PLIST_SUB+=	WINBINDD=""
+.else
+CONFIGURE_ARGS+=	--without-winbind
+PLIST_SUB+=	WINBINDD="@comment "
 .endif
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
@@ -91,36 +150,183 @@ CONFIGURE_ARGS+=	--with-acl-support
 .endif
 
 .if defined(WITH_LIBICONV)
-LIB_DEPENDS+=		iconv.3:${PORTSDIR}/converters/libiconv
+.if exists(${LOCALBASE}/lib/libbiconv.so)
+BROKEN=		"installed iconv-2.* port let's the character conversion capabilities detection fail. please deinstall it first if you want to use this feature"
+.endif
+.else
+USE_ICONV=	yes
 CONFIGURE_ARGS+=	--with-libiconv
 .endif
 
 .if defined(WITHOUT_POPT)
 CONFIGURE_ARGS+=	--with-included-popt
 .else
-LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS+=	popt.0:${PORTSDIR}/devel/popt
+.endif
+
+.if defined(WITH_READLINE)
+CONFIGURE_ARGS+=	--with-readline
+.endif
+
+# experimantal SAM backends
+
+.if defined(WITH_MYSQLSAM) && defined(WITH_POSTGRESQLSAM) && defined(WITH_XMLSAM)
+USE_MYSQL?=	40
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql-client \
+		xml2.5:${PORTSDIR}/textproc/libxml2
+CONFIGURE_ARGS+=	--with-expsam=mysql,pgsql,xml
+PLIST_SUB+=	MYSQLSAM="" \
+		POSTGRESQLSAM="" \
+		XMLSAM=""
+.endif
+.if !defined(WITH_XMLSAM) && defined(WITH_MYSQLSAM) && defined(WITH_POSTGRESQLSAM)
+USE_MYSQL?=	40
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql-client
+CONFIGURE_ARGS+=	--with-expsam=mysql,pgsql
+PLIST_SUB+=	MYSQLSAM="" \
+		POSTGRESQLSAM="" \
+		XMLSAM="@comment "
+.endif
+.if !defined(WITH_POSTGRESQLSAM) && defined(WITH_MYSQLSAM) && defined(WITH_XMLSAM)
+USE_MYSQL?=	40
+LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
+CONFIGURE_ARGS+=	--with-expsam=mysql,xml
+PLIST_SUB+=	MYSQLSAM="" \
+		POSTGRESQLSAM="@comment " \
+		XMLSAM=""
+.endif
+.if !defined(WITH_XMLSAM) && !defined(WITH_POSTGRESQLSAM) && defined(WITH_MYSQLSAM)
+USE_MYSQL?=	40
+CONFIGURE_ARGS+=	--with-expsam=mysql
+PLIST_SUB+=	MYSQLSAM="" \
+		POSTGRESQLSAM="@comment " \
+		XMLSAM="@comment "
+.endif
+.if !defined(WITH_MYSQLSAM) && defined(WITH_POSTGRESQLSAM) && defined(WITH_XMLSAM)
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql-client \
+		xml2.5:${PORTSDIR}/textproc/libxml2
+CONFIGURE_ARGS+=	--with-expsam=pgsql,xml
+PLIST_SUB+=	MYSQLSAM="@comment " \
+		POSTGRESQLSAM="" \
+		XMLSAM=""
+.endif
+.if !defined(WITH_XMLSAM) && !defined(WITH_MYSQLSAM) && defined(WITH_POSTGRESQLSAM)
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql-client
+CONFIGURE_ARGS+=	--with-expsam=pgsql
+PLIST_SUB+=	MYSQLSAM="@comment " \
+		POSTGRESQLSAM="" \
+		XMLSAM="@comment "
+.endif
+.if !defined(WITH_POSTGRESQLSAM) && !defined(WITH_MYSQLSAM) && defined(WITH_XMLSAM)
+LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
+CONFIGURE_ARGS+=	--with-expsam=xml
+PLIST_SUB+=	MYSQLSAM="@comment " \
+		POSTGRESQLSAM="@comment " \
+		XMLSAM=""
+.endif
+.if !defined(WITH_POSTGRESQLSAM) && !defined(WITH_MYSQLSAM) && !defined(WITH_XMLSAM)
+PLIST_SUB+=	MYSQLSAM="@comment " \
+		POSTGRESQLSAM="@comment " \
+		XMLSAM="@comment "
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		findsmb.1 nmblookup.1 log2pcap.1 \
+MAN1=		findsmb.1 nmblookup.1 log2pcap.1 smbget.1 \
 		rpcclient.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
 		smbstatus.1 smbtar.1 testparm.1 testprns.1 wbinfo.1 vfstest.1 \
 		editreg.1 ntlm_auth.1 profiles.1 smbcquotas.1 smbtree.1
 MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7
 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
+		smbpasswd.8 smbspool.8 smbumount.8 swat.8 winbindd.8 \
+		tdbdump.8 tdbbackup.8
+
+pre-configure:
+	@${ECHO_MSG} "->"
+	@${ECHO_MSG} "-> you can enable or disable some features by defining following variables."
+	@${ECHO_MSG} "->"
+.ifndef(WITH_LDAP)
+	@${ECHO_MSG} "-> WITH_LDAP		(ldap passdb backend, also needed by ADS)"
+.endif
+.ifndef(WITH_LDAP_COMPAT)
+	@${ECHO_MSG} "-> WITH_LDAP_COMPAT	(ldap passdb backend 2.2.x compatible)"
+.endif
+.ifndef(WITH_ADS)
+	@${ECHO_MSG} "-> WITH_ADS		(Active Directory CLIENT support, needs LDAP and KRB5)"
+.endif
+.ifndef(KRB5_HOME)
+	@${ECHO_MSG} "-> KRB5_HOME		(path to Kerberos5, needed by ADS)"
+.endif
+.ifndef(WITH_QUOTAS)
+	@${ECHO_MSG} "-> WITH_QUOTAS		(quota support)"
+.endif
+.ifndef(WITH_SYS_QUOTAS)
+	@${ECHO_MSG} "-> WITH_SYS_QUOTAS	(new sys_quota support)"
+.endif
+.ifndef(WITH_ACL_SUPPORT)
+	@${ECHO_MSG} "-> WITH_ACL_SUPPORT	(access control list support, requires FreeBSD-5.x)"
+.endif
+.ifndef(WITH_SYSLOG)
+	@${ECHO_MSG} "-> WITH_SYSLOG		(enable syslog logging)"
+.endif
+.ifndef(WITH_UTMP)
+	@${ECHO_MSG} "-> WITH_UTMP		(utmp logging)"
+.endif
+.ifndef(WITH_WINBIND)
+	@${ECHO_MSG} "-> WITH_WINBIND		(build winbind daemon)"
+.endif
+.ifndef(WITH_MSDFS)
+	@${ECHO_MSG} "-> WITH_MSDFS		(enable MicroSoft Distributed FileSystem capabilities)"
+.endif
+.ifndef(WITH_LIBICONV)
+	@${ECHO_MSG} "-> WITH_LIBICONV	(enable character set conversion capabilities)"
+.endif
+.ifndef(WITH_READLINE)
+	@${ECHO_MSG} "-> WITH_READLINE	(enable readline support)"
+.endif
+.ifndef(WITH_PYTHON)
+	@${ECHO_MSG} "-> WITH_PYTHON		(build python libraries)"
+.endif
+.ifndef(WITH_MYSQLSAM)
+	@${ECHO_MSG} "-> WITH_MYSQLSAM	(enable EXPERIMENTAL mysql - SAM backend)"
+.endif
+.ifndef(WITH_POSTGRESQLSAM)
+	@${ECHO_MSG} "-> WITH_POSTGRESQLSAM	(enable EXPERIMENTAL postgresql - SAM backend)"
+.endif
+.ifndef(WITH_XMLSAM)
+	@${ECHO_MSG} "-> WITH_XMLSAM		(enable EXPERIMENTAL xml - SAM backend)"
+.endif
+.ifndef(WITHOUT_CUPS)
+	@${ECHO_MSG} "-> WITHOUT_CUPS		(disable CUPS printing support)"
+.endif
+.ifndef(WITHOUT_POPT)
+	@${ECHO_MSG} "-> WITHOUT_POPT		(use the samba included popt library)"
+.endif
+	@${ECHO_MSG} "->"
+	@${ECHO_MSG} "-> look in the Makefile for more tuneable variables."
+	@${ECHO_MSG} "->"
 
 post-install:
+.if defined(WITH_PYTHON)
+	@if [ ! -d ${PREFIX}/lib/${PYTHON_VERSION}/site-packages ]; then \
+		${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages ; \
+	fi
+	${CP} -r ${WRKSRC}/build/lib.*/samba \
+		${PREFIX}/lib/${PYTHON_VERSION}/site-packages/
+.endif
 	${MKDIR} ${PREFIX}/share/examples/samba
 	${CP} -rp ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%SAMBA_CONFDIR%%|${SAMBA_CONFDIR}|g" \
+		-e "s|%%RC_SUBR%%|${RC_SUBR}|g" < \
+		${FILESDIR}/samba.sh.sample > ${WRKDIR}/samba.sh.sample
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file." ;	\
-		${INSTALL_SCRIPT} ${FILESDIR}/samba.sh.sample 		\
+		${INSTALL_SCRIPT} ${WRKDIR}/samba.sh.sample 		\
 			${STARTUP_SCRIPT} ;				\
 	fi
 	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && ${CHMOD} 1777 ${SAMBA_SPOOL}
+	@test -d ${SAMBA_LOCKDIR} || ${MKDIR} ${SAMBA_LOCKDIR} && ${CHMOD} 0755 ${SAMBA_LOCKDIR}
 	@if [ ! -f ${SAMPLE_CONFIG} ]; then				\
 		${SED} -e 's!%%SAMBA_SPOOL%%!${SAMBA_SPOOL}!'		\
 			-e 's!%%SAMBA_LOGDIR%%!${SAMBA_LOGDIR}!'	\
@@ -145,7 +351,7 @@ post-install:
 	${ECHO_CMD} "private/smbpasswd" >> ${TMPPLIST}
 	${ECHO_CMD} "@dirrm private" >> ${TMPPLIST}
 .else
-	${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_PRIVATE}/smbpasswd manually.\"" >> ${TMPPLIST}
 .endif
 
 .if !defined(NOPORTDOCS)
@@ -166,7 +372,9 @@ post-install:
 		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
 			if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
 				if [ $$j != ${WRKDIR}/${DISTNAME}/docs/textdocs/outdated ] ; then \
-					${INSTALL_DATA} $$j ${DOCSDIR}/$$i ;\
+					if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/images ] ; then \
+						${INSTALL_DATA} $$j ${DOCSDIR}/$$i ;\
+					fi; \
 				fi; \
 			fi; \
 		done							\
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 3f6023bccb27..da59ee4b4d3e 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1,2 @@
-MD5 (samba-3.0.1.tar.bz2) = 2a3d494f139ab7402d8902b0e68c463f
+MD5 (samba-3.0.2a.tar.bz2) = 72979a30ac450c8b0567c1ac9886884a
+SIZE (samba-3.0.2a.tar.bz2) = 9289178
diff --git a/net/samba3/files/patch-source_Makefile.in b/net/samba3/files/patch-source_Makefile.in
index 93f130842445..55fa7639dcb0 100644
--- a/net/samba3/files/patch-source_Makefile.in
+++ b/net/samba3/files/patch-source_Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Jan  3 14:45:46 2004
-+++ Makefile.in	Sat Jan  3 14:50:05 2004
-@@ -1192,7 +1192,7 @@
+--- Makefile.in.orig	Tue Feb 24 10:13:47 2004
++++ Makefile.in	Tue Feb 24 10:14:00 2004
+@@ -1204,7 +1204,7 @@
  
  bin/t_snprintf@EXEEXT@: lib/snprintf.c
  	$(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm
diff --git a/net/samba3/files/patch-unit_pw b/net/samba3/files/patch-unit_pw
deleted file mode 100644
index 822010cb12e3..000000000000
--- a/net/samba3/files/patch-unit_pw
+++ /dev/null
@@ -1,263 +0,0 @@
-Index: source/passdb/pdb_get_set.c
-===================================================================
-RCS file: /data/cvs/samba/source/passdb/pdb_get_set.c,v
-retrieving revision 1.26.2.4
-diff -u -r1.26.2.4 pdb_get_set.c
---- passdb/pdb_get_set.c	7 Nov 2003 17:36:50 -0000	1.26.2.4
-+++ passdb/pdb_get_set.c	5 Feb 2004 14:43:53 -0000
-@@ -933,7 +933,11 @@
- 
- 	data_blob_clear_free(&sampass->private.nt_pw);
- 	
--	sampass->private.nt_pw = data_blob(pwd, NT_HASH_LEN);
-+       if (pwd) {
-+               sampass->private.nt_pw = data_blob(pwd, NT_HASH_LEN);
-+       } else {
-+               sampass->private.nt_pw = data_blob(NULL, 0);
-+       }
- 
- 	return pdb_set_init_flags(sampass, PDB_NTPASSWD, flag);
- }
-@@ -949,7 +953,11 @@
- 
- 	data_blob_clear_free(&sampass->private.lm_pw);
- 	
--	sampass->private.lm_pw = data_blob(pwd, LM_HASH_LEN);
-+       if (pwd) {
-+               sampass->private.lm_pw = data_blob(pwd, LM_HASH_LEN);
-+       } else {
-+               sampass->private.lm_pw = data_blob(NULL, 0);
-+       }
- 
- 	return pdb_set_init_flags(sampass, PDB_LMPASSWD, flag);
- }
-Index: source/passdb/pdb_interface.c
-===================================================================
-RCS file: /data/cvs/samba/source/passdb/pdb_interface.c,v
-retrieving revision 1.47.2.3
-diff -u -r1.47.2.3 pdb_interface.c
---- passdb/pdb_interface.c	8 Sep 2003 14:13:34 -0000	1.47.2.3
-+++ passdb/pdb_interface.c	5 Feb 2004 14:43:54 -0000
-@@ -36,6 +36,44 @@
- 
- static struct pdb_init_function_entry *pdb_find_backend_entry(const char *name);
- 
-+/*******************************************************************
-+ Clean up uninitialised passwords.  The only way to tell 
-+ that these values are not 'real' is that they do not
-+ have a valid last set time.  Instead, the value is fixed at 0. 
-+ Therefore we use that as the key for 'is this a valid password'.
-+ However, it is perfectly valid to have a 'default' last change
-+ time, such LDAP with a missing attribute would produce.
-+********************************************************************/
-+
-+static void pdb_force_pw_initialization(SAM_ACCOUNT *pass) 
-+{
-+	const char *lm_pwd, *nt_pwd;
-+	
-+	/* only reset a password if the last set time has been 
-+	   explicitly been set to zero.  A default last set time 
-+	   is ignored */
-+
-+	if ( (pdb_get_init_flags(pass, PDB_PASSLASTSET) != PDB_DEFAULT) 
-+		&& (pdb_get_pass_last_set_time(pass) == 0) ) 
-+	{
-+		
-+		if (pdb_get_init_flags(pass, PDB_LMPASSWD) != PDB_DEFAULT) 
-+		{
-+			lm_pwd = pdb_get_lanman_passwd(pass);
-+			if (lm_pwd) 
-+				pdb_set_lanman_passwd(pass, NULL, PDB_SET);
-+		}
-+		if (pdb_get_init_flags(pass, PDB_NTPASSWD) != PDB_DEFAULT) 
-+		{
-+			nt_pwd = pdb_get_nt_passwd(pass);
-+			if (nt_pwd) 
-+				pdb_set_nt_passwd(pass, NULL, PDB_SET);
-+		}
-+	}
-+
-+	return;
-+}
-+
- NTSTATUS smb_register_passdb(int version, const char *name, pdb_init_function init) 
- {
- 	struct pdb_init_function_entry *entry = backends;
-@@ -141,6 +179,7 @@
- 		context->pwent_methods->setsampwent(context->pwent_methods, False);
- 	}
- 	user->methods = context->pwent_methods;
-+	pdb_force_pw_initialization(user);
- 	return ret;
- }
- 
-@@ -156,6 +195,7 @@
- 	curmethods = context->pdb_methods;
- 	while (curmethods){
- 		if (NT_STATUS_IS_OK(ret = curmethods->getsampwnam(curmethods, sam_acct, username))) {
-+			pdb_force_pw_initialization(sam_acct);
- 			sam_acct->methods = curmethods;
- 			return ret;
- 		}
-@@ -179,6 +219,7 @@
- 
- 	while (curmethods){
- 		if (NT_STATUS_IS_OK(ret = curmethods->getsampwsid(curmethods, sam_acct, sid))) {
-+			pdb_force_pw_initialization(sam_acct);
- 			sam_acct->methods = curmethods;
- 			return ret;
- 		}
-@@ -191,12 +232,26 @@
- static NTSTATUS context_add_sam_account(struct pdb_context *context, SAM_ACCOUNT *sam_acct)
- {
- 	NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-+	const char *lm_pw, *nt_pw;
-+	uint16 acb_flags;
- 
- 	if ((!context) || (!context->pdb_methods)) {
- 		DEBUG(0, ("invalid pdb_context specified!\n"));
- 		return ret;
- 	}
- 
-+	/* disable acccounts with no passwords (that has not 
-+	   been allowed by the  ACB_PWNOTREQ bit */
-+	
-+	lm_pw = pdb_get_lanman_passwd( sam_acct );
-+	nt_pw = pdb_get_lanman_passwd( sam_acct );
-+	acb_flags = pdb_get_acct_ctrl( sam_acct );
-+	if ( !lm_pw && !nt_pw && !(acb_flags&ACB_PWNOTREQ) ) {
-+		acb_flags |= ACB_DISABLED;
-+		pdb_set_acct_ctrl( sam_acct, acb_flags, PDB_SET );
-+		pdb_set_init_flags(sam_acct, PDB_ACCTCTRL, PDB_SET);
-+	}
-+	
- 	/** @todo  This is where a 're-read on add' should be done */
- 	/* We now add a new account to the first database listed. 
- 	 * Should we? */
-@@ -207,6 +262,8 @@
- static NTSTATUS context_update_sam_account(struct pdb_context *context, SAM_ACCOUNT *sam_acct)
- {
- 	NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-+	const char *lm_pw, *nt_pw;
-+	uint16 acb_flags;
- 
- 	if (!context) {
- 		DEBUG(0, ("invalid pdb_context specified!\n"));
-@@ -218,6 +275,18 @@
- 		return ret;
- 	}
- 
-+	/* disable acccounts with no passwords (that has not 
-+	   been allowed by the  ACB_PWNOTREQ bit */
-+	
-+	lm_pw = pdb_get_lanman_passwd( sam_acct );
-+	nt_pw = pdb_get_lanman_passwd( sam_acct );
-+	acb_flags = pdb_get_acct_ctrl( sam_acct );
-+	if ( !lm_pw && !nt_pw && !(acb_flags&ACB_PWNOTREQ) ) {
-+		acb_flags |= ACB_DISABLED;
-+		pdb_set_acct_ctrl( sam_acct, acb_flags, PDB_SET );
-+		pdb_set_init_flags(sam_acct, PDB_ACCTCTRL, PDB_SET);
-+	}
-+	
- 	/** @todo  This is where a 're-read on update' should be done */
- 
- 	return sam_acct->methods->update_sam_account(sam_acct->methods, sam_acct);
-@@ -671,7 +740,7 @@
- 	if (!pdb_context) {
- 		return False;
- 	}
--
-+	
- 	return NT_STATUS_IS_OK(pdb_context->pdb_add_sam_account(pdb_context, sam_acct));
- }
- 
-Index: source/utils/pdbedit.c
-===================================================================
-RCS file: /data/cvs/samba/source/utils/pdbedit.c,v
-retrieving revision 1.87.2.5
-diff -u -r1.87.2.5 pdbedit.c
---- utils/pdbedit.c	4 Dec 2003 20:35:40 -0000	1.87.2.5
-+++ utils/pdbedit.c	5 Feb 2004 14:43:54 -0000
-@@ -47,6 +47,7 @@
- #define BIT_RESERV_7	0x00800000
- #define BIT_IMPORT	0x01000000
- #define BIT_EXPORT	0x02000000
-+#define BIT_FIX_INIT    0x04000000
- 
- #define MASK_ALWAYS_GOOD	0x0000001F
- #define MASK_USER_GOOD		0x00401F00
-@@ -234,6 +235,39 @@
- }
- 
- /*********************************************************
-+ Fix a list of Users for uninitialised passwords
-+**********************************************************/
-+static int fix_users_list (struct pdb_context *in)
-+{
-+	SAM_ACCOUNT *sam_pwent=NULL;
-+	BOOL check, ret;
-+	
-+	check = NT_STATUS_IS_OK(in->pdb_setsampwent(in, False));
-+	if (!check) {
-+		return 1;
-+	}
-+
-+	check = True;
-+	if (!(NT_STATUS_IS_OK(pdb_init_sam(&sam_pwent)))) return 1;
-+
-+	while (check && (ret = NT_STATUS_IS_OK(in->pdb_getsampwent (in, sam_pwent)))) {
-+		if (!pdb_update_sam_account(sam_pwent)) {
-+			DEBUG(0, ("Update of user %s failed!\n", pdb_get_username(sam_pwent)));
-+		}
-+		pdb_free_sam(&sam_pwent);
-+		check = NT_STATUS_IS_OK(pdb_init_sam(&sam_pwent));
-+		if (!check) {
-+			DEBUG(0, ("Failed to initialise new SAM_ACCOUNT structure (out of memory?)\n"));
-+		}
-+			
-+	}
-+	if (check) pdb_free_sam(&sam_pwent);
-+	
-+	in->pdb_endsampwent(in);
-+	return 0;
-+}
-+
-+/*********************************************************
-  Set User Info
- **********************************************************/
- 
-@@ -550,6 +584,7 @@
- 	static char *backend_in = NULL;
- 	static char *backend_out = NULL;
- 	static BOOL transfer_groups = False;
-+	static BOOL  force_initialised_password = False;
- 	static char *logon_script = NULL;
- 	static char *profile_path = NULL;
- 	static char *account_control = NULL;
-@@ -587,6 +622,7 @@
- 		{"account-policy",	'P', POPT_ARG_STRING, &account_policy, 0,"value of an account policy (like maximum password age)",NULL},
- 		{"value",       'C', POPT_ARG_LONG, &account_policy_value, 'C',"set the account policy to this value", NULL},
- 		{"account-control",	'c', POPT_ARG_STRING, &account_control, 0, "Values of account control", NULL},
-+		{"force-initialized-passwords", 0, POPT_ARG_NONE, &force_initialised_password, 0, "Force initialization of corrupt password strings in a passdb backend", NULL},
- 		POPT_COMMON_SAMBA
- 		POPT_TABLEEND
- 	};
-@@ -631,6 +667,7 @@
- 			(machine ? BIT_MACHINE : 0) +
- 			(user_name ? BIT_USER : 0) +
- 			(list_users ? BIT_LIST : 0) +
-+			(force_initialised_password ? BIT_FIX_INIT : 0) +
- 			(modify_user ? BIT_MODIFY : 0) +
- 			(add_user ? BIT_CREATE : 0) +
- 			(delete_user ? BIT_DELETE : 0) +
-@@ -654,6 +691,10 @@
- 	
- 	/* the lowest bit options are always accepted */
- 	checkparms = setparms & ~MASK_ALWAYS_GOOD;
-+
-+	if (checkparms & BIT_FIX_INIT) {
-+		return fix_users_list(bdef);
-+	}
- 
- 	/* account policy operations */
- 	if ((checkparms & BIT_ACCPOLICY) && !(checkparms & ~(BIT_ACCPOLICY + BIT_ACCPOLVAL))) {
diff --git a/net/samba3/files/samba.sh.sample b/net/samba3/files/samba.sh.sample
index e6807ad6d145..d0a46a32d30e 100644
--- a/net/samba3/files/samba.sh.sample
+++ b/net/samba3/files/samba.sh.sample
@@ -1,22 +1,61 @@
 #!/bin/sh
-smbspool=/var/spool/samba
-pidfiledir=/var/run
-smbd=/usr/local/sbin/smbd
-nmbd=/usr/local/sbin/nmbd
-
-# start
-if [ "x$1" = "x" -o "x$1" = "xstart" ]; then
-	if [ -f $smbd ]; then
-		if [ -d $smbspool ]; then
-			rm -f $smbspool/*
-		fi
-		echo -n ' Samba'
-		$smbd -D
-		$nmbd -D
-	fi
-
-# stop
-elif [ "x$1" = "xstop" ]; then
-	kill `cat $pidfiledir/smbd.pid`
-	kill `cat $pidfiledir/nmbd.pid`
-fi
+#
+
+# PROVIDE: samba
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable samba:
+#
+#smbd_enable="YES"
+#smbd_flags="-D"	- optional because "-D" is the default flag
+#
+#nmbd_enable="YES"
+#nmbd_flags="-D"	- optional because "-D" is the default flag
+#
+#winbindd_enable="YES"
+#winbindd_flags=""	- optional
+#
+
+. %%RC_SUBR%%
+
+name=smbd
+rcvar=`set_rcvar`
+command=%%PREFIX%%/sbin/smbd
+required_files=%%SAMBA_CONFDIR%%/smb.conf
+pidfile=/var/run/smbd.pid
+
+# set defaults
+
+smbd_enable=${smbd_enable:-"NO"}
+smbd_flags=${smbd_flags:-"-D"}
+load_rc_config $name
+run_rc_command "$1"
+
+name=nmbd
+rcvar=`set_rcvar`
+command=%%PREFIX%%/sbin/nmbd
+required_files=%%SAMBA_CONFDIR%%/smb.conf
+pidfile=/var/run/nmbd.pid
+
+# set defaults
+
+nmbd_enable=${nmbd_enable:-"NO"}
+nmbd_flags=${nmbd_flags:-"-D"}
+load_rc_config $name
+run_rc_command "$1"
+
+name=winbindd
+rcvar=`set_rcvar`
+command=%%PREFIX%%/sbin/winbindd
+required_files=%%SAMBA_CONFDIR%%/smb.conf
+pidfile=/var/run/winbindd.pid
+
+# set defaults
+
+winbindd_enable=${winbindd_enable:-"NO"}
+winbindd_flags=${winbindd_flags:-""}
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index a7c2e632a6d2..8050c3ae94da 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -19,44 +19,37 @@ bin/tdbbackup
 bin/tdbdump
 bin/testparm
 bin/testprns
-bin/wbinfo
-etc/charset/CP437.so
-etc/charset/CP850.so
-etc/de.msg
-etc/en.msg
-etc/fr.msg
-etc/it.msg
-etc/ja.msg
-etc/lowcase.dat
-etc/nl.msg
-etc/pl.msg
-etc/rc.d/samba.sh.sample
-etc/smb.conf.default
-etc/tr.msg
-etc/upcase.dat
-etc/valid.dat
-etc/vfs/audit.so
-etc/vfs/cap.so
-etc/vfs/default_quota.so
-etc/vfs/extd_audit.so
-etc/vfs/fake_perms.so
-etc/vfs/netatalk.so
-etc/vfs/readonly.so
-etc/vfs/recycle.so
+%%WINBINDD%%bin/wbinfo
 sbin/nmbd
 sbin/smbd
 sbin/swat
-sbin/winbindd
+%%WINBINDD%%sbin/winbindd
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/__init__.py
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/lsa.so
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/printerdata.py
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/samr.so
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/smb.so
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/spoolss.so
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/srvsvc.so
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/tdb.so
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/tdbpack.so
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/winbind.so
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/winreg.so
+%%PORTDOCS%%share/doc/samba/README.FreeBSD
+%%PORTDOCS%%share/doc/samba/README
 %%PORTDOCS%%share/doc/samba/COPYING
 %%PORTDOCS%%share/doc/samba/Manifest
-%%PORTDOCS%%share/doc/samba/README
-%%PORTDOCS%%share/doc/samba/README.FreeBSD
 %%PORTDOCS%%share/doc/samba/Read-Manifest-Now
+%%PORTDOCS%%share/doc/samba/Roadmap
+%%PORTDOCS%%share/doc/samba/WHATSNEW.txt
+%%PORTDOCS%%share/doc/samba/THANKS
+%%PORTDOCS%%share/doc/samba/history
 %%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/Win-2Kx-XPP-DeleteCachedProfiles.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win-2Kx-XPP-ForceLocalProfile.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win-NT-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
@@ -65,16 +58,12 @@ sbin/winbindd
 %%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/AccessControls.html
 %%PORTDOCS%%share/doc/samba/htmldocs/AdvancedNetworkManagement.html
 %%PORTDOCS%%share/doc/samba/htmldocs/Appendixes.html
@@ -132,9 +121,9 @@ sbin/winbindd
 %%PORTDOCS%%share/doc/samba/htmldocs/profiles.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/rpcclient.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/samba-bdc.html
+%%PORTDOCS%%share/doc/samba/htmldocs/samba.css
 %%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
 %%PORTDOCS%%share/doc/samba/htmldocs/smbcacls.1.html
@@ -142,6 +131,7 @@ sbin/winbindd
 %%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/smbget.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmnt.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbmount.8.html
 %%PORTDOCS%%share/doc/samba/htmldocs/smbpasswd.5.html
@@ -155,6 +145,7 @@ sbin/winbindd
 %%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/tdbdump.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
@@ -165,34 +156,42 @@ sbin/winbindd
 %%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/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/ChangeLog
-share/examples/samba/LDAP/smbldap-tools/FILES
-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/pdb/mysql/mysql.dump
+share/examples/samba/pdb/mysql/smb.conf
+share/examples/samba/pdb/pdb_test.c
+share/examples/samba/pdb/Makefile
+share/examples/samba/pdb/README
+share/examples/samba/pdb/sambapdb.dtd
+share/examples/samba/validchars/msdos70.out
+share/examples/samba/validchars/nwdos70.out
+share/examples/samba/validchars/readme
+share/examples/samba/validchars/validchr.c
+share/examples/samba/validchars/validchr.com
+share/examples/samba/tridge/smb.conf.WinNT
+share/examples/samba/tridge/README
+share/examples/samba/tridge/smb.conf
+share/examples/samba/tridge/smb.conf.vittjokk
+share/examples/samba/tridge/smb.conf.fjall
+share/examples/samba/tridge/smb.conf.lapland
+share/examples/samba/thoralf/smb.conf
+share/examples/samba/svr4-startup/samba.server
+share/examples/samba/svr4-startup/README
+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/md4.c
+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/COPYING
+share/examples/samba/LDAP/smbldap-tools/Makefile
+share/examples/samba/LDAP/smbldap-tools/FILES
+share/examples/samba/LDAP/smbldap-tools/INSTALL
+share/examples/samba/LDAP/smbldap-tools/INFRASTRUCTURE
+share/examples/samba/LDAP/smbldap-tools/README
+share/examples/samba/LDAP/smbldap-tools/TODO
 share/examples/samba/LDAP/smbldap-tools/smbldap-groupadd.pl
 share/examples/samba/LDAP/smbldap-tools/smbldap-groupdel.pl
 share/examples/samba/LDAP/smbldap-tools/smbldap-groupmod.pl
@@ -207,77 +206,72 @@ 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/README
+share/examples/samba/LDAP/smbldap-tools/ChangeLog
+share/examples/samba/LDAP/README
+share/examples/samba/LDAP/samba-schema-netscapeds4.x
+share/examples/samba/LDAP/convertSambaAccount
+share/examples/samba/LDAP/samba-nds.schema
+share/examples/samba/LDAP/ldapsync.pl
+share/examples/samba/LDAP/samba.schema.at.IBM-DS
+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.oc.IBM-DS
+share/examples/samba/simple/README
+share/examples/samba/simple/smb.conf
+share/examples/samba/printing/readme.prtpub
+share/examples/samba/printing/prtpub.c
+share/examples/samba/printing/smbprint-new.sh
+share/examples/samba/printing/smbprint
+share/examples/samba/printing/smbprint.sysv
+share/examples/samba/printer-accounting/hp5-redir
+share/examples/samba/printer-accounting/README
+share/examples/samba/printer-accounting/acct-all
+share/examples/samba/printer-accounting/acct-sum
+share/examples/samba/printer-accounting/lp-acct
+share/examples/samba/printer-accounting/printcap
+share/examples/samba/VFS/skel_transparent.c
 share/examples/samba/VFS/.cvsignore
-share/examples/samba/VFS/Makefile.in
 share/examples/samba/VFS/README
+share/examples/samba/VFS/Makefile.in
 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/VFS/shadow_copy_test.c
+share/examples/samba/ntlogon/ntlogon.conf
+share/examples/samba/ntlogon/README
+share/examples/samba/ntlogon/ntlogon.py
+share/examples/samba/wins_hook/dns_update
+share/examples/samba/wins_hook/README
+share/examples/samba/misc/modify_samba_config.pl
+share/examples/samba/misc/extra_smbstatus
+share/examples/samba/misc/wall.perl
+share/examples/samba/misc/swat.pl
+share/examples/samba/libsmbclient/testsmbc.c
+share/examples/samba/libsmbclient/Makefile
+share/examples/samba/libsmbclient/README
+share/examples/samba/libsmbclient/tree.c
+share/examples/samba/libsmbclient/testacl.c
+share/examples/samba/genlogon/genlogon.pl
+share/examples/samba/dce-dfs/README
+share/examples/samba/dce-dfs/smb.conf
+share/examples/samba/autofs/auto.a
+share/examples/samba/auth/auth_skel.c
+share/examples/samba/auth/Makefile
+share/examples/samba/appliance/appliance.spec
 share/examples/samba/appliance/Makefile
 share/examples/samba/appliance/README
-share/examples/samba/appliance/appliance.spec
 share/examples/samba/appliance/build.sh
 share/examples/samba/appliance/smb.conf-appliance
-share/examples/samba/auth/Makefile
-share/examples/samba/auth/auth_skel.c
-share/examples/samba/autofs/auto.a
-share/examples/samba/dce-dfs/README
-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/Makefile
-share/examples/samba/pdb/README
-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
-share/examples/samba/printer-accounting/hp5-redir
-share/examples/samba/printer-accounting/lp-acct
-share/examples/samba/printer-accounting/printcap
-share/examples/samba/printing/prtpub.c
-share/examples/samba/printing/readme.prtpub
-share/examples/samba/printing/smbprint
-share/examples/samba/printing/smbprint-new.sh
-share/examples/samba/printing/smbprint.sysv
-share/examples/samba/simple/README
-share/examples/samba/simple/smb.conf
+share/examples/samba/nss/nss_winbind.c
+share/examples/samba/nss/nss_winbind.h
+share/examples/samba/README
 share/examples/samba/smb.conf.default
-share/examples/samba/svr4-startup/README
-share/examples/samba/svr4-startup/samba.server
-share/examples/samba/thoralf/smb.conf
-share/examples/samba/tridge/README
-share/examples/samba/tridge/smb.conf
-share/examples/samba/tridge/smb.conf.WinNT
-share/examples/samba/tridge/smb.conf.fjall
-share/examples/samba/tridge/smb.conf.lapland
-share/examples/samba/tridge/smb.conf.vittjokk
-share/examples/samba/validchars/msdos70.out
-share/examples/samba/validchars/nwdos70.out
-share/examples/samba/validchars/readme
-share/examples/samba/validchars/validchr.c
-share/examples/samba/validchars/validchr.com
-share/examples/samba/wins_hook/README
-share/examples/samba/wins_hook/dns_update
+share/swat/help/welcome.html
 share/swat/help/AccessControls.html
 share/swat/help/AdvancedNetworkManagement.html
 share/swat/help/Appendixes.html
@@ -294,8 +288,8 @@ 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/ProfileMgmt.html
 share/swat/help/Samba-Developers-Guide.html
 share/swat/help/Samba-HOWTO-Collection.html
 share/swat/help/SambaHA.html
@@ -335,6 +329,7 @@ share/swat/help/problems.html
 share/swat/help/profiles.1.html
 share/swat/help/rpcclient.1.html
 share/swat/help/samba-bdc.html
+share/swat/help/smbd.8.html
 share/swat/help/samba-pdc.html
 share/swat/help/samba.7.html
 share/swat/help/securing-samba.html
@@ -343,7 +338,7 @@ 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/smbget.1.html
 share/swat/help/smbmnt.8.html
 share/swat/help/smbmount.8.html
 share/swat/help/smbpasswd.5.html
@@ -357,6 +352,7 @@ 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/tdbdump.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
 share/swat/help/troubleshooting.html
@@ -365,7 +361,6 @@ 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
 share/swat/help/winbind.html
 share/swat/help/winbindd.8.html
 share/swat/images/globals.gif
@@ -394,26 +389,6 @@ share/swat/lang/tr/images/shares.gif
 share/swat/lang/tr/images/status.gif
 share/swat/lang/tr/images/viewconfig.gif
 share/swat/lang/tr/include/header.html
-share/swat/using_samba/appa.html
-share/swat/using_samba/appb.html
-share/swat/using_samba/appc.html
-share/swat/using_samba/appd.html
-share/swat/using_samba/appe.html
-share/swat/using_samba/appf.html
-share/swat/using_samba/appg.html
-share/swat/using_samba/ch00.html
-share/swat/using_samba/ch01.html
-share/swat/using_samba/ch02.html
-share/swat/using_samba/ch03.html
-share/swat/using_samba/ch04.html
-share/swat/using_samba/ch05.html
-share/swat/using_samba/ch06.html
-share/swat/using_samba/ch07.html
-share/swat/using_samba/ch08.html
-share/swat/using_samba/ch09.html
-share/swat/using_samba/ch10.html
-share/swat/using_samba/ch11.html
-share/swat/using_samba/ch12.html
 share/swat/using_samba/figs/sam2_0101.gif
 share/swat/using_samba/figs/sam2_0102.gif
 share/swat/using_samba/figs/sam2_0103.gif
@@ -553,16 +528,63 @@ share/swat/using_samba/figs/sam2_af04.gif
 share/swat/using_samba/figs/sam2_af05.gif
 share/swat/using_samba/figs/sam2_af06.gif
 share/swat/using_samba/figs/sam2_af07.gif
+share/swat/using_samba/appa.html
+share/swat/using_samba/appb.html
+share/swat/using_samba/appc.html
+share/swat/using_samba/appd.html
+share/swat/using_samba/appe.html
+share/swat/using_samba/appf.html
+share/swat/using_samba/appg.html
+share/swat/using_samba/ch00.html
+share/swat/using_samba/ch01.html
+share/swat/using_samba/ch02.html
+share/swat/using_samba/ch03.html
+share/swat/using_samba/ch04.html
+share/swat/using_samba/ch05.html
+share/swat/using_samba/ch06.html
+share/swat/using_samba/ch07.html
+share/swat/using_samba/ch08.html
+share/swat/using_samba/ch09.html
+share/swat/using_samba/ch10.html
+share/swat/using_samba/ch11.html
+share/swat/using_samba/ch12.html
 share/swat/using_samba/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
-@dirrm etc/pdb
-@dirrm etc/rpc
-@dirrm etc/vfs
+@unexec rm %%SAMBA_CONFDIR%%/charset/CP437.so 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/charset/CP850.so 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/de.msg 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/en.msg 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/fr.msg 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/it.msg 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/ja.msg 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/nl.msg 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/lowcase.dat 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/pl.msg 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/smb.conf.default 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/tr.msg 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/upcase.dat 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/valid.dat 2>&1 >/dev/null || true
+%%MYSQLSAM%%@unexec rm %%SAMBA_CONFDIR%%/pdb/mysql.so 2>&1 >/dev/null || true
+%%POSTGRESQLSAM%%@unexec rm %%SAMBA_CONFDIR%%/pdb/pgsql.so 2>&1 >/dev/null || true
+%%XMLSAM%%@unexec rm %%SAMBA_CONFDIR%%/pdb/xml.so 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/vfs/audit.so 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/vfs/cap.so 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/vfs/default_quota.so 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/vfs/extd_audit.so 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/vfs/fake_perms.so 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/vfs/netatalk.so 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/vfs/readonly.so 2>&1 >/dev/null || true
+@unexec rm %%SAMBA_CONFDIR%%/vfs/recycle.so 2>&1 >/dev/null || true
+@unexec rmdir %%SAMBA_CONFDIR%%/auth 2>&1 >/dev/null || true
+@unexec rmdir %%SAMBA_CONFDIR%%/charset 2>&1 >/dev/null || true
+@unexec rmdir %%SAMBA_CONFDIR%%/idmap 2>&1 >/dev/null || true
+@unexec rmdir %%SAMBA_CONFDIR%%/pdb 2>&1 >/dev/null || true
+@unexec rmdir %%SAMBA_CONFDIR%%/rpc 2>&1 >/dev/null || true
+@unexec rmdir %%SAMBA_CONFDIR%%/vfs 2>&1 >/dev/null || true
+@unexec rm %%LOCALBASE%%/etc/rc.d/samba.sh.sample
+%%PYTHON%%@dirrm lib/%%PYTHON_VERSION%%/site-packages/samba
 @dirrm share/swat/using_samba/figs
 @dirrm share/swat/using_samba
 @dirrm share/swat/include
@@ -607,3 +629,5 @@ share/swat/using_samba/toc.html
 %%PORTDOCS%%@dirrm share/doc/samba/htmldocs
 %%PORTDOCS%%@dirrm share/doc/samba/faq
 %%PORTDOCS%%@dirrm share/doc/samba
+@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %%SAMBA_SPOOL%% manually."
+@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %%SAMBA_LOCKDIR%%/*.tdb manually."