* Usage of OPTIONS and config target for GUI configuration tool (PR 50044).

* No(?) hidden dependencies, configuration variables for almost all available
  options, with ability to negate OS defaults (PR 60414).
* Consistent ADS and WINBIND support, with all the necessary pam and nss
  modules, as well as with documentation (PR 50039).
* rcNG startup script, that handles start of winbindd as well (PR 44273).
* CONFIGURE_ENV get PREFIX by default (fixes PR 61636 and PR 60254).
* Better support for hier(7) - suplimentary modules went from etc/ to
  lib/samba/, log files are in /var/log/samba (PR 60254 and PR 62728).
* libsmbclient installs with all necessary symlinks (PR 60994).
* Incorporate fixes to smb.conf.default from PR 60994.
* Clean installation of manpages(no linux staff).
* Various other small fixes.
* Pass Maintainership to "Timur I. Bakeyev <timur@gnu.org>"

Submitted by:	"Timur I. Bakeyev <timur@gnu.org>"
Approved by:	dwcjr (old maintainer)

7 files changed, 644 insertions, 458 deletions

diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 304df511a25a..c2fad7923f6d 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -6,139 +6,219 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0.2a
+PORTVERSION=	3.0.2.a
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	http://us3.samba.org/samba/ftp/%SUBDIR%/
-MASTER_SITE_SUBDIR=	. rc old-versions
-#DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
-
-MAINTAINER=	ports@FreeBSD.org
+MASTER_SITES=	http://us1.samba.org/samba/ftp/%SUBDIR%/ \
+		http://us3.samba.org/samba/ftp/%SUBDIR%/ \
+		http://us4.samba.org/samba/ftp/%SUBDIR%/ \
+		ftp://ca.samba.org/%SUBDIR%/ \
+		ftp://de.samba.org/samba.org/%SUBDIR%/ \
+		ftp://ftp.k2.net/mirrors/samba/%SUBDIR%/ \
+		ftp://ftp.oss.eznetsols.org/samba/%SUBDIR%/ \
+		ftp://gd.tuwien.ac.at/infosys/servers/samba/%SUBDIR%/ \
+		ftp://giswitch.sggw.waw.pl/pub/unix/samba/%SUBDIR%/ \
+		ftp://ru.samba.org/pub/samba/%SUBDIR%/ \
+		ftp://tr.samba.org/samba/%SUBDIR%/ \
+		http://sambafr.idealx.org/samba/ftp/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. rc
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/}
+
+MAINTAINER=	timur@gnu.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
 
-CONFLICTS=	ja-samba-2.* samba-3.* sharity-light-1.*
+CONFLICTS=	ja-samba-2.* samba-3.* sharity-light-1.* samba-libsmbclient-3.*
+
+OPTIONS=	CUPS		"With CUPS printing support" on \
+		LDAP		"With LDAP support" on \
+		KRB5		"With Kerberos5 support" on \
+		ADS		"With Active Directory support" on \
+		WINBIND		"With WinBIND support" on \
+		ACL_SUPPORT	"With ACL support" off \
+		SYSLOG		"With Syslog support" off \
+		QUOTAS		"With Quota support" off \
+		UTMP		"With UTMP support" on \
+		MSDFS		"With MSDFS support" off \
+		SAM_XML		"With XML smbpasswd backend" off \
+		SAM_MYSQL	"With MYSQL smbpasswd backend" off \
+		SAM_PGSQL	"With PostgreSQL smbpasswd backend" off \
+		SAM_OLD_LDAP	"With Samba2.x LDAP smbpasswd backend" off \
+		PAM_SMBPASS	"With SMB PAM module" off \
+		PYTHON		"With Python experimental bindings" off \
+		LIBICONV	"With installed ICONV library" off \
+		POPT		"With installed POPT library" on
 
 USE_BZIP2=	yes
 USE_SIZE=	yes
 USE_RC_SUBR=	yes
-
-.if !defined(WITHOUT_CUPS)
-WITH_CUPS=	yes
-.else
-CONFIGURE_ARGS+=	--enable-cups=no
-.endif
-
-.if defined(WITH_CUPS)
-LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-base
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
-.endif
+NO_LATEST_LINK=	yes
+INSTALLS_SHLIB=	yes
+#GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER=	253
 
 # directories
-VARDIR=		/var
-SAMBA_SPOOL=	${VARDIR}/spool/samba
-SAMBA_LOCKDIR?=	${VARDIR}/lock
-SAMBA_LOGDIR?=	${VARDIR}/log
+VARDIR=		${DESTDIR}/var
+SAMBA_SPOOL?=	${VARDIR}/spool/samba
+SAMBA_LOGDIR=	${VARDIR}/log/samba
+SAMBA_RUNDIR=	${VARDIR}/run
 SAMBA_PRIVATE?=	${PREFIX}/private
 SAMBA_CONFDIR?=	${PREFIX}/etc
-# sample files
-STARTUP_SCRIPT=	${LOCALBASE}/etc/rc.d/samba.sh.sample
-SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
-DOCSDIR=	${PREFIX}/share/doc/samba
+SAMBA_SWATDIR=	${PREFIX}/share/swat
+SAMBA_LIBDIR=	${PREFIX}/lib
+DOCSDIR?=	${PREFIX}/share/doc/samba
+EXAMPLESDIR?=	${PREFIX}/share/examples/samba
+RC_DIR?=	${SAMBA_CONFDIR}/rc.d
+SAMBA_CONFIG=	${SAMBA_CONFDIR}/smb.conf
 
-NO_LATEST_LINK=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER=	253
-CONFIGURE_ARGS=	--libdir=${SAMBA_CONFDIR} \
-		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
-		--with-sambabook=${PREFIX}/share/swat/using_samba \
-		--with-lockdir=${SAMBA_LOCKDIR} \
+CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
+		--libdir=${SAMBA_LIBDIR}/samba \
+		--localstatedir=${VARDIR} \
+		--with-configdir=${SAMBA_CONFDIR} \
+		--with-swatdir=${SAMBA_SWATDIR} \
+		--with-sambabook=${SAMBA_SWATDIR}/using_samba \
+		--with-lockdir=${SAMBA_SPOOL} --with-piddir=${SAMBA_RUNDIR} \
 		--with-privatedir=${SAMBA_PRIVATE} \
-		--exec-prefix=${PREFIX} --with-pam --without-manpages-langs \
-		--with-piddir=${VARDIR}/run --with-logfilebase=${SAMBA_LOGDIR} \
-		--with-configdir=${SAMBA_CONFDIR}
+		--with-logfilebase=${SAMBA_LOGDIR} \
+		--with-pam --with-readline --with-libsmbclient \
+		--with-manpages-langs=en
 
-PLIST_SUB=	SAMBA_CONFDIR=${SAMBA_CONFDIR} \
-		SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
-		SAMBA_SPOOL=${SAMBA_SPOOL} \
-		PYTHON_VERSION=${PYTHON_VERSION}
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PYTHON)
-USE_PYTHON=	2.1+
+USE_PYTHON=		2.1+
+# Hack to make it work with OPTIONS. Breakes portlint
+.include "${PORTSDIR}/Mk/bsd.python.mk"
 CONFIGURE_ARGS+=	--with-python
-PLIST_SUB+=	PYTHON=""
+PLIST_SUB+=		PYTHON="" \
+			PYTHON_VERSION=${PYTHON_VERSION}
 .else
-PLIST_SUB+=	PYTHON="@comment "
+CONFIGURE_ARGS+=	--without-python
+PLIST_SUB+=		PYTHON="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+.if !defined(WITHOUT_CUPS)
+WITH_CUPS=		yes
+.endif
 
-.if defined(WITH_LDAP_COMPAT)
-.ifndef(WITH_LDAP)
-USE_OPENLDAP_VER?=	21
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+.if defined(WITH_CUPS)
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=	--enable-cups
+CUPS=			cups
+.else
+CONFIGURE_ARGS+=	--disable-cups
+CUPS=			""
 .endif
-CONFIGURE_ARGS+=	--with-ldapsam
+
+.if defined(WITH_SYSLOG)
+CONFIGURE_ARGS+=	--with-syslog
 .endif
 
-.if defined(WITH_LDAP)
-.ifndef(WITH_LDAP_COMPAT)
-USE_OPENLDAP_VER?=	21
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+.if defined(WITH_QUOTAS)
+CONFIGURE_ARGS+=	--with-quotas
 .endif
-CONFIGURE_ARGS+=	--with-ldap
+
+.if defined(WITHOUT_UTMP)
+CONFIGURE_ARGS+=	--without-utmp
 .endif
 
-.if defined(WITH_LDAP) && defined(WITH_LDAP_COMPAT)
-USE_OPENLDAP_VER?=	21
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+.if defined(WITH_MSDFS)
+CONFIGURE_ARGS+=	--with-msdfs
+.endif
+
+.if !defined(WITHOUT_WINBIND)
+CONFIGURE_ARGS+=	--with-winbind
+PLIST_SUB+=		WINBIND=""
+.else
+CONFIGURE_ARGS+=	--without-winbind
+PLIST_SUB+=		WINBIND="@comment "
+.endif
+
+.if !defined(WITHOUT_LDAP)
+WANT_LDAP=		yes
+CONFIGURE_ARGS+=	--with-ldap
+.else
+CONFIGURE_ARGS+=	--without-ldap
 .endif
 
+.if !defined(WITHOUT_KRB5) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
+CONFIGURE_ARGS+=	--with-krb5=${KRB5_HOME}
+.elif !defined(WITHOUT_KRB5) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
+CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
+.elif !defined(WITHOUT_KRB5) && (defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105) && exists(/usr/lib/libkrb5.a)
+CONFIGURE_ARGS+=	--with-krb5=/usr
+.else
+# Kerberos5 is necessary for ADS
 .if defined(WITH_ADS)
-.ifndef(KRB5_HOME)
-BROKEN=		"Needs KRB5_HOME=/path/to/Kerberos5_prefix"
+BROKEN=			"Kerberos5 is necessary for ADS support. Please, install either Heimdal or MIT-Kerberos"
 .endif
-.ifndef(WITH_LDAP) && !defined(WITH_LDAP_COMPAT)
-BROKEN=		"Needs WITH_LDAP=yes or WITH_LDAP_COMPAT=yes"
+WITHOUT_ADS=		yes
+CONFIGURE_ARGS+=	--without-krb5
 .endif
+
+.if !defined(WITHOUT_ADS)
+WANT_LDAP=		yes
 CONFIGURE_ARGS+=	--with-ads
+.else
+CONFIGURE_ARGS+=	--without-ads
 .endif
 
-.if defined(WITH_SYSLOG)
-CONFIGURE_ARGS+=	--with-syslog
+# SAM
+.if defined(WITH_SAM_XML)
+#USE_GNOME=		libxml2
+LIB_DEPENDS+=		xml2.5:${PORTSDIR}/textproc/libxml2
+CONFIGURE_ARGS+=	--with-xml-prefix=${LOCALBASE}
+WANT_EXPSAM_MODULES+=	xml
+PLIST_SUB+=		SAMXML=""
+.else
+PLIST_SUB+=		SAMXML="@comment "
 .endif
 
-.if defined(WITH_QUOTAS)
-CONFIGURE_ARGS+=	--with-quotas
+.if defined(WITH_SAM_MYSQL)
+USE_MYSQL=		yes
+CONFIGURE_ARGS+=	--with-mysql-prefix=${LOCALBASE}
+WANT_EXPSAM_MODULES+=	mysql
+PLIST_SUB+=		SAMMYSQL=""
+.else
+PLIST_SUB+=		SAMMYSQL="@comment "
 .endif
 
-.if defined(WITH_SYS_QUOTAS)
-CONFIGURE_ARGS+=	--with-sys-quotas
+.if defined(WITH_SAM_PGSQL)
+LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql-client
+CONFIGURE_ARGS+=	--with-pgsql-prefix=${LOCALBASE}
+WANT_EXPSAM_MODULES+=	pgsql
+PLIST_SUB+=		SAMPGSQL=""
+.else
+PLIST_SUB+=		SAMPGSQL="@comment "
 .endif
 
-.if defined(WITH_UTMP)
-CONFIGURE_ARGS+=	--with-utmp
+.if defined(WITH_SAM_OLD_LDAP)
+WANT_LDAP=		yes
+CONFIGURE_ARGS+=	--with-ldapsam
+.else
+CONFIGURE_ARGS+=	--without-ldapsam
 .endif
 
-.if defined(WITH_MSDFS)
-CONFIGURE_ARGS+=	--with-msdfs
+.if defined(WANT_EXPSAM_MODULES) && !empty(WANT_EXPSAM_MODULES)
+WANT_EXPSAM_MODULES!=	${ECHO_CMD} ${WANT_EXPSAM_MODULES} | ${SED} -e 's/ /,/g'
+CONFIGURE_ARGS+=	--with-expsam=${WANT_EXPSAM_MODULES}
 .endif
+# SAM
 
-.if defined(WITH_WINBIND)
-CONFIGURE_ARGS+=	--with-winbind
-PLIST_SUB+=	WINBINDD=""
-.else
-CONFIGURE_ARGS+=	--without-winbind
-PLIST_SUB+=	WINBINDD="@comment "
+.if defined(WANT_LDAP)
+USE_OPENLDAP=		yes
+USE_OPENLDAP_VER?=	21
 .endif
 
-.if defined(KRB5_HOME) && exists(${KRB5_HOME})
-CONFIGURE_ARGS+=	--with-krb5=${KRB5_HOME}
+.if defined(WITH_PAM_SMBPASS)
+CONFIGURE_ARGS+=	--with-pam_smbpass
+PLIST_SUB+=		SMBPASS=""
 .else
-CONFIGURE_ARGS+=	--with-krb5=no
+CONFIGURE_ARGS+=	--without-pam_smbpass
+PLIST_SUB+=		SMBPASS="@comment "
 .endif
 
 .if defined(WITH_ACL_SUPPORT)
@@ -151,209 +231,110 @@ CONFIGURE_ARGS+=	--with-acl-support
 
 .if defined(WITH_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"
+BROKEN=			"Installed iconv-2.* port breaks detection of the character conversion. Please deinstall it first, if you want to use this feature"
 .endif
-.else
-USE_ICONV=	yes
+USE_ICONV=		yes
 CONFIGURE_ARGS+=	--with-libiconv
 .endif
 
-.if defined(WITHOUT_POPT)
-CONFIGURE_ARGS+=	--with-included-popt
+.if !defined(WITHOUT_POPT)
+LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
 .else
-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 "
+CONFIGURE_ARGS+=	--with-included-popt
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-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
+MLINKS=		samba.7 Samba.7
+MAN1=		findsmb.1 nmblookup.1 log2pcap.1 rpcclient.1 \
+		smbget.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
+		smbstatus.1 smbtar.1 testparm.1 testprns.1 vfstest.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 \
-		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)"
+MAN8=		nmbd.8 smbd.8 net.8 pdbedit.8 smbpasswd.8 smbspool.8 \
+		swat.8 tdbdump.8 tdbbackup.8
+.if !defined(WITHOUT_WINBIND)
+MAN1+=		wbinfo.1
+MAN8+=		winbindd.8
 .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)"
+
+.if !defined(WITHOUT_WINBIND)
+WINBIND_FILTER=		${SED} -e 's|%%WINBIND%%||g'
+.else
+WINBIND_FILTER=		${GREP} -v '^%%WINBIND%%'
 .endif
-	@${ECHO_MSG} "->"
-	@${ECHO_MSG} "-> look in the Makefile for more tuneable variables."
-	@${ECHO_MSG} "->"
+
+PLIST_SUB+=		RC_DIR=${RC_DIR} \
+			SAMBA_SPOOL=${SAMBA_SPOOL} \
+			SAMBA_LOGDIR=${SAMBA_LOGDIR}
+
+RC_SCRIPTS_SUB=		PREFIX=${PREFIX} \
+			RC_SUBR=${RC_SUBR} \
+			RC_DIR=${RC_DIR} \
+			CUPS=${CUPS} \
+			SAMBA_CONFIG=${SAMBA_CONFIG} \
+			SAMBA_SPOOL=${SAMBA_SPOOL} \
+			SAMBA_RUNDIR=${SAMBA_RUNDIR}
 
 post-install:
+.for sect in 1 5 7 8
+	@${MKDIR} ${MAN${sect}PREFIX}/man/man${sect}
+.for man in ${MAN${sect}}
+	@${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN${sect}PREFIX}/man/man${sect}
+.endfor
+.endfor
+	@${MKDIR} ${EXAMPLESDIR}
+	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/* ${EXAMPLESDIR}
+.if defined(WITH_PAM_SMBPASS)
+	@${MKDIR} ${EXAMPLESDIR}/pam_smbpass
+	@${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* ${EXAMPLESDIR}/pam_smbpass
+.endif
 .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} ${WRKDIR}/samba.sh.sample 		\
-			${STARTUP_SCRIPT} ;				\
-	fi
+	@${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages
+	@${CP} -R ${WRKSRC}/build/lib.*/samba ${PREFIX}/lib/${PYTHON_VERSION}/site-packages
+	@${MKDIR} ${EXAMPLESDIR}/python
+	@${CP} -Rp ${WRKSRC}/python/examples/* ${EXAMPLESDIR}/python
+.endif
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+	    ${FILESDIR}/samba.sh.sample | ${WINBIND_FILTER} > ${WRKDIR}/samba.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/samba.sh ${RC_DIR}/samba.sh
 	@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}!'	\
-			-e 's!%%SAMBA_CONFDIR%%!${SAMBA_CONFDIR}!'	\
-			${FILESDIR}/smb.conf.default			\
-			> ${SAMPLE_CONFIG} ;				\
-	fi
-	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
+	@test -d ${SAMBA_LOGDIR} || ${MKDIR} ${SAMBA_LOGDIR}
+	${SED}  -e 's!%%SAMBA_SPOOL%%!${SAMBA_SPOOL}!'			\
+		-e 's!%%SAMBA_LOGDIR%%!${SAMBA_LOGDIR}!'		\
+		-e 's!%%SAMBA_CONFDIR%%!${SAMBA_CONFDIR}!'		\
+		${FILESDIR}/smb.conf.default				\
+		> ${SAMBA_CONFIG}.default ;					\
+	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
 	if [ ! -d ${SAMBA_PRIVATE} ] ; then				\
 		${MKDIR} ${SAMBA_PRIVATE} ;				\
 		${CHOWN} root:wheel ${SAMBA_PRIVATE} ;			\
 	fi
 	${CHMOD} 700 ${SAMBA_PRIVATE}
 	if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then			\
-		${CAT} /etc/passwd | ${GREP} -v "^#" | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd ; \
-		${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd ;			\
+		${CAT} ${DESTDIR}/etc/passwd | ${GREP} -v "^#" | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd ; \
+		${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd ;		\
 	fi
 	${CHMOD} 500 ${SAMBA_PRIVATE}
 	${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
 	${CHMOD} 111 ${PREFIX}/bin/smbpasswd
 .if defined(PACKAGE_BUILDING)
-	${ECHO_CMD} "private/smbpasswd" >> ${TMPPLIST}
-	${ECHO_CMD} "@dirrm private" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHMOD} 500 ${SAMBA_PRIVATE}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_PRIVATE}" >> ${TMPPLIST}
 .else
-	${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_PRIVATE}/smbpasswd manually.\"" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/* manually.\"" >> ${TMPPLIST}
+.endif
+	-@${LN} -snf libsmbclient.so.0 ${SAMBA_LIBDIR}/libsmbclient.so
+.if !defined(WITHOUT_WINBIND)
+	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1
+	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so ${SAMBA_LIBDIR}/nss_wins.so.1
+	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR}
+.endif
+.if defined(WITH_PAM_SMBPASS)
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
 .endif
-
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
@@ -365,18 +346,14 @@ post-install:
 			${WRKDIR}/${DISTNAME}/WHATSNEW.txt		\
 			${WRKDIR}/${DISTNAME}/docs/THANKS		\
 			${WRKDIR}/${DISTNAME}/docs/history ; do		\
-		${INSTALL_DATA} $$i ${DOCSDIR} ;		\
+		${INSTALL_DATA} $$i ${DOCSDIR} ;			\
 	done
-	for i in faq htmldocs Registry ; do			\
-		${MKDIR} ${DOCSDIR}/$$i ;		\
+	for i in faq Registry htmldocs htmldocs/images ; do		\
+		${MKDIR} ${DOCSDIR}/$$i ;				\
 		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 \
-					if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/images ] ; then \
-						${INSTALL_DATA} $$j ${DOCSDIR}/$$i ;\
-					fi; \
-				fi; \
-			fi; \
+		    if [ -f $$j ]; then					\
+		    	${INSTALL_DATA} $$j ${DOCSDIR}/$$i ;		\
+		    fi; 						\
 		done							\
 	done
 .endif
diff --git a/net/samba-devel/files/README.FreeBSD b/net/samba-devel/files/README.FreeBSD
index 67cc86c58cb2..24234b687c89 100644
--- a/net/samba-devel/files/README.FreeBSD
+++ b/net/samba-devel/files/README.FreeBSD
@@ -2,8 +2,8 @@ If you want to use samba ports,
 
 1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf, and edit
    it.
-2. Copy /usr/local/etc/rc.d/samba.sh.sample to /usr/local/etc/rc.d/samba.sh
-3. Type /usr/local/etc/rc.d/samba.sh or reboot.
+2. Put string 'samba_enable="YES"' into your /etc/rc.conf.
+3. Type '/usr/local/etc/rc.d/samba.sh start' or reboot.
 
 See document files in /usr/local/share/doc/samba and example config files in
 /usr/local/share/examples/samba for details.
diff --git a/net/samba-devel/files/patch-installman.sh b/net/samba-devel/files/patch-installman.sh
deleted file mode 100644
index 5ec4061a559e..000000000000
--- a/net/samba-devel/files/patch-installman.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- script/installman.sh.orig	Wed Aug 21 09:33:36 2002
-+++ script/installman.sh	Wed Aug 21 09:33:53 2002
-@@ -22,7 +22,7 @@
- 	echo Installing \"$lang\" man pages in $MANDIR/lang/$lang
-     fi
- 
--    langdir=$MANDIR/$lang
-+    langdir=$MANDIR
-     for d in $MANDIR $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do
- 	if [ ! -d $d ]; then
- 	    mkdir $d
diff --git a/net/samba-devel/files/patch-source_Makefile.in b/net/samba-devel/files/patch-source_Makefile.in
index 55fa7639dcb0..05811dbdd358 100644
--- a/net/samba-devel/files/patch-source_Makefile.in
+++ b/net/samba-devel/files/patch-source_Makefile.in
@@ -1,11 +1,73 @@
---- Makefile.in.orig	Tue Feb 24 10:13:47 2004
-+++ Makefile.in	Tue Feb 24 10:14:00 2004
-@@ -1204,7 +1204,7 @@
+--- Makefile.in.orig	Fri Feb  6 23:40:27 2004
++++ Makefile.in	Thu Mar  4 05:47:34 2004
+@@ -101,6 +101,7 @@
+ LIBSMBCLIENT_MAJOR=0
+ LIBSMBCLIENT_MINOR=1
+ 
++NSS_VERSION=1
+ 
+ FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)
+ FLAGS2 = 
+@@ -951,8 +952,8 @@
+ 		@SONAMEFLAG@`basename $@`
+ 
+ bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
+-	@echo Linking libsmbclient shared library $@
+-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(DYNEXP) $(LIBS) \
++	@echo Linking libsmbclient shared library $@.$(LIBSMBCLIENT_MAJOR)
++	@$(SHLD) $(LDSHFLAGS) -o $@.$(LIBSMBCLIENT_MAJOR) $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ 		$(KRB5LIBS) $(LDAP_LIBS) \
+ 		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
+ 
+@@ -1035,13 +1036,13 @@
+ @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
+ 	@echo "Linking $@"
+ 	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
+-		@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`
++		@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`.$(NSS_VERSION)
+ 
+ @WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
+ 	@echo "Linking $@"
+ 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
+ 		$(LDAP_LIBS) $(KRB5LIBS) -lc \
+-		@SONAMEFLAG@`basename $@`
++		@SONAMEFLAG@`basename $@`.$(NSS_VERSION)
+ 
+ nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
+ 	@echo "Linking $@"
+@@ -1204,7 +1205,7 @@
  
  bin/t_snprintf@EXEEXT@: lib/snprintf.c
  	$(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm
 -install: installbin installman installscripts installdat installswat installmodules @INSTALLCLIENT@
-+install: installbin installman installscripts installdat installswat installmodules
++install: installbin installscripts installdat installswat installmodules @INSTALLCLIENT@
  
  install-everything: install installmodules
  
+@@ -1256,7 +1257,7 @@
+ 
+ installclientlib: installdirs libsmbclient
+ 	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib
+-	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib
++	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@.$(LIBSMBCLIENT_MAJOR) $(DESTDIR)${prefix}/lib
+ 	-$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib
+ 	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
+ 	-$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
+@@ -1276,7 +1277,7 @@
+ 	fi
+ 	PYTHON_OBJS="$(PYTHON_PICOBJS)" \
+ 	PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
+-	LIBS="$(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \
++	LIBS="$(LDFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \
+ 		$(PYTHON) python/setup.py build
+ 
+ python_install: $(PYTHON_PICOBJS)
+@@ -1286,7 +1287,7 @@
+ 	fi
+ 	PYTHON_OBJS="$(PYTHON_PICOBJS)" \
+ 	PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
+-	LIBS="$(LIBS)" \
++	LIBS="$(LDFLAGS) $(LIBS)" \
+ 		$(PYTHON) python/setup.py install
+ 
+ python_clean:
diff --git a/net/samba-devel/files/samba.sh.sample b/net/samba-devel/files/samba.sh.sample
index d0a46a32d30e..0221db03567c 100644
--- a/net/samba-devel/files/samba.sh.sample
+++ b/net/samba-devel/files/samba.sh.sample
@@ -1,61 +1,123 @@
 #!/bin/sh
 #
+# $FreeBSD$
+#
 
-# PROVIDE: samba
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
+# PROVIDE: nmbd smbd
+%%WINBIND%%# PROVIDE: winbindd
+# REQUIRE: NETWORKING SERVERS named %%CUPS%%
+# BEFORE: DAEMON
 # 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
+#samba_enable="YES"
 #
-#nmbd_enable="YES"
-#nmbd_flags="-D"	- optional because "-D" is the default flag
+# or, for fine grain control
 #
-#winbindd_enable="YES"
-#winbindd_flags=""	- optional
+#nmbd_enable="YES"
+#smbd_enable="YES"
+%%WINBIND%%#winbindd_enable="YES"
 #
 
 . %%RC_SUBR%%
 
-name=smbd
+name=samba
 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"
+# Set defaults
+samba_config=${samba_config:-"%%SAMBA_CONFIG%%"}
+# Config file is required
+if [ ! -r ${samba_config} ]; then
+    warn "${samba_config} is not readable."
+    case $1 in
+	force*) : ;;
+	*) exit 1 ;;
+    esac
+fi
 
-name=nmbd
-rcvar=`set_rcvar`
-command=%%PREFIX%%/sbin/nmbd
-required_files=%%SAMBA_CONFDIR%%/smb.conf
-pidfile=/var/run/nmbd.pid
+if checkyesno samba_enable; then
+    nmbd_enable=${nmbd_enable:-"YES"}
+    smbd_enable=${smbd_enable:-"YES"}
+%%WINBIND%%    winbindd_enable=${winbindd_enable:-"YES"}
+%%WINBIND%%    # Check, that winbind is actally configured
+%%WINBIND%%    if [ ! "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then
+%%WINBIND%%    	#warn "Winbind support is not configured"
+%%WINBIND%%	winbindd_enable="NO"
+%%WINBIND%%    fi
+fi
+
+# Hack until run_rc_command() get rid of exit()
+samba_stop() {
+    pid=$(check_pidfile ${pidfile} ${command})
+    if [ -z ${pid} ]; then
+	echo "${name} not running? (check ${pidfile})."
+	return 1
+    fi
+    echo "Stopping ${command}."
+    kill -${sig_stop:-TERM} ${pid}
+    [ $? -ne 0 ] && [ -z "$rc_force" ] && return 1
+    wait_for_pids ${pid}
+}
 
-# set defaults
+nmbd_precmd() {
+    # XXX: Never delete winbindd_idmap.tdb and winbindd_cache.tdb
+    if [ -d "%%SAMBA_SPOOL%%" ]; then
+	echo "Starting SAMBA: removing stale tdbs :"
+	for file in connections.tdb locking.tdb messages.tdb \
+		    sessionid.tdb unexpected.tdb brlock.tdb \
+		    namelist.debug
+	do
+	    rm -vf "%%SAMBA_SPOOL%%/$file"
+	done
+    fi
+}
 
+# nmbd
+name=nmbd
+rcvar=`set_rcvar`
+command="%%PREFIX%%/sbin/${name}"
+required_dirs="%%SAMBA_SPOOL%%"
+pidfile=%%SAMBA_RUNDIR%%/${name}.pid
+start_precmd="nmbd_precmd"
+stop_cmd="samba_stop"
+# Defaults
 nmbd_enable=${nmbd_enable:-"NO"}
 nmbd_flags=${nmbd_flags:-"-D"}
+command_args="${nmbd_flags} -s ${samba_config}"
+
 load_rc_config $name
 run_rc_command "$1"
 
-name=winbindd
+# smbd
+name=smbd
 rcvar=`set_rcvar`
-command=%%PREFIX%%/sbin/winbindd
-required_files=%%SAMBA_CONFDIR%%/smb.conf
-pidfile=/var/run/winbindd.pid
-
-# set defaults
+command="%%PREFIX%%/sbin/${name}"
+pidfile=%%SAMBA_RUNDIR%%/${name}.pid
+start_precmd=":"
+stop_cmd="samba_stop"
+# Defaults
+smbd_enable=${smbd_enable:-"NO"}
+smbd_flags=${smbd_flags:-"-D"}
+command_args="${smbd_flags} -s ${samba_config}"
 
-winbindd_enable=${winbindd_enable:-"NO"}
-winbindd_flags=${winbindd_flags:-""}
 load_rc_config $name
 run_rc_command "$1"
+%%WINBIND%%
+%%WINBIND%%# winbindd
+%%WINBIND%%name=winbindd
+%%WINBIND%%rcvar=`set_rcvar`
+%%WINBIND%%command="%%PREFIX%%/sbin/${name}"
+%%WINBIND%%required_dirs="%%SAMBA_SPOOL%%"
+%%WINBIND%%pidfile=%%SAMBA_RUNDIR%%/${name}.pid
+%%WINBIND%%start_precmd=":"
+%%WINBIND%%stop_cmd="samba_stop"
+%%WINBIND%%# Defaults
+%%WINBIND%%winbindd_enable=${winbindd_enable:-"NO"}
+%%WINBIND%%winbindd_flags=${winbindd_flags:-""}
+%%WINBIND%%command_args="${winbindd_flags} -s ${samba_config}"
+%%WINBIND%%
+%%WINBIND%%load_rc_config $name
+%%WINBIND%%run_rc_command "$1"
diff --git a/net/samba-devel/files/smb.conf.default b/net/samba-devel/files/smb.conf.default
index 8046bf75398a..20b7fecb2965 100644
--- a/net/samba-devel/files/smb.conf.default
+++ b/net/samba-devel/files/smb.conf.default
@@ -3,13 +3,16 @@
 # here. Samba has a huge number of configurable options (perhaps too
 # many!) most of which are not shown in this example
 #
+# For a step by step guide on installation, configuration and usage of Samba, 
+# read the Samba HOWTO Collection.
+#
 # Any line which starts with a ; (semi-colon) or a # (hash) 
 # is a comment and is ignored. In this example we will use a #
 # for commentry and a ; for parts of the config file that you
 # may wish to enable
 #
 # NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not many any basic syntactic errors. 
+# to check that you have not made any basic syntactic errors. 
 #
 #======================= Global Settings =====================================
 [global]
@@ -20,6 +23,31 @@
 # server string is the equivalent of the NT Description field
    server string = Samba Server
 
+# Security mode. Defines in which mode Samba will operate. Possible 
+# values are share, user, server, domain and ads. Most people will want 
+# user level security. See the HOWTO Collection for details.
+   security = user
+
+# Use password server option only with security = server
+# The argument list may include:
+#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
+# or to auto-locate the domain controller/s
+#   password server = *
+;   password server = <NT-Server-Name>
+
+# You may wish to use password encryption. Please read
+# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
+# Do not enable this option unless you have read those documents
+;  encrypt passwords = yes
+# Use the realm option only with security = ads
+# Specifies the Active Directory realm the host is part of
+;   realm = MY_REALM
+
+# Backend to store user information in. New installations should 
+# use either tdbsam or ldapsam. smbpasswd is available for backwards 
+# compatibility. tdbsam requires no further configuration.
+;   passdb backend = tdbsam
+
 # This option is important for security. It allows you to restrict
 # connections to machines which are on your local network. The
 # following example restricts access to two C class networks and
@@ -41,7 +69,7 @@
 
 # It should not be necessary to specify the print system type unless
 # it is non-standard. Currently supported print systems include:
-# bsd, sysv, plp, lprng, aix, hpux, qnx
+# cups, bsd, sysv, plp, lprng, aix, hpux, qnx
 ;   printing = bsd
 
 # Uncomment this if you want a guest account, you must add this to /etc/passwd
@@ -55,24 +83,17 @@
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
 
-# Security mode. Most people will want user level security. See
-# security_level.txt for details.
-   security = user
-# Use password server option only with security = server
-;   password server = <NT-Server-Name>
-
-# You may wish to use password encryption. Please read
-# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
-# Do not enable this option unless you have read those documents
-;  encrypt passwords = yes
 
 # Using the following line enables you to customise your configuration
 # on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
+# of the machine that is connecting.
+# Note: Consider carefully the location in the configuration file of
+#       this line.  The included file is read at that point.
 ;   include = %%SAMBA_CONFDIR%%/smb.conf.%m
 
 # Most people will find that this option gives better performance.
-# See speed.txt and the manual pages for details
+# See the chapter 'Samba performance issues' in the Samba HOWTO Collection
+# and the manual pages for details.
    socket options = TCP_NODELAY 
 
 # Configure Samba to use multiple interfaces
@@ -132,8 +153,7 @@
 ;   wins proxy = yes
 
 # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
-# this has been changed in version 1.9.18 to no.
+# via DNS nslookups. The default is NO.
    dns proxy = no 
 
 # charset settings
@@ -141,19 +161,27 @@
 ;   unix charset = ASCII
 ;   dos charset = ASCII
 
-# 
+# These scripts are used on a domain controller or stand-alone 
+# machine to add or delete corresponding unix accounts
+;  add user script = /usr/sbin/useradd %u
+;  add group script = /usr/sbin/groupadd %g
+;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
+;  delete user script = /usr/sbin/userdel %u
+;  delete user from group script = /usr/sbin/deluser %u %g
+;  delete group script = /usr/sbin/groupdel %g
+
 #============================ Share Definitions ==============================
 [homes]
    comment = Home Directories
    browseable = no
-   writeable = yes
+   writable = yes
 
 # Un-comment the following and create the netlogon directory for Domain Logons
 ; [netlogon]
 ;   comment = Network Logon Service
 ;   path = /usr/local/samba/lib/netlogon
 ;   guest ok = yes
-;   writeable = no
+;   writable = no
 ;   share modes = no
 
 
@@ -173,7 +201,7 @@
    browseable = no
 # Set public = yes to allow user 'guest account' to print
    guest ok = no
-   writeable = no
+   writable = no
    printable = yes
 
 # This one is useful for people to share files
@@ -189,7 +217,7 @@
 ;   comment = Public Stuff
 ;   path = /home/samba
 ;   public = yes
-;   writeable = yes
+;   writable = yes
 ;   printable = no
 ;   write list = @staff
 
@@ -204,7 +232,7 @@
 ;   path = /homes/fred
 ;   printer = freds_printer
 ;   public = no
-;   writeable = no
+;   writable = no
 ;   printable = yes
 
 # A private directory, usable only by fred. Note that fred requires write
@@ -214,7 +242,7 @@
 ;   path = /usr/somewhere/private
 ;   valid users = fred
 ;   public = no
-;   writeable = yes
+;   writable = yes
 ;   printable = no
 
 # a service which has a different directory for each machine that connects
@@ -225,23 +253,23 @@
 ;  comment = PC Directories
 ;  path = /usr/pc/%m
 ;  public = no
-;  writeable = yes
+;  writable = yes
 
 # A publicly accessible directory, read/write to all users. Note that all files
 # created in the directory by users will be owned by the default user, so
 # any user with access can delete any other user's files. Obviously this
-# directory must be writeable by the default user. Another user could of course
+# directory must be writable by the default user. Another user could of course
 # be specified, in which case all files would be owned by that user instead.
 ;[public]
 ;   path = /usr/somewhere/else/public
 ;   public = yes
 ;   only guest = yes
-;   writeable = yes
+;   writable = yes
 ;   printable = no
 
 # The following two entries demonstrate how to share a directory so that two
 # users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writeable by both users and should have the
+# setup, the directory should be writable by both users and should have the
 # sticky bit set on it to prevent abuse. Obviously this could be extended to
 # as many users as required.
 ;[myshare]
@@ -249,7 +277,7 @@
 ;   path = /usr/somewhere/shared
 ;   valid users = mary fred
 ;   public = no
-;   writeable = yes
+;   writable = yes
 ;   printable = no
 ;   create mask = 0765
 
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
index 8050c3ae94da..a59e3e56c332 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -19,11 +19,47 @@ bin/tdbbackup
 bin/tdbdump
 bin/testparm
 bin/testprns
-%%WINBINDD%%bin/wbinfo
-sbin/nmbd
+%%WINBIND%%bin/wbinfo
+@unexec %D/etc/rc.d/samba.sh forcestop 2>/dev/null || true
+etc/rc.d/samba.sh
+@unexec if cmp -s %D/etc/smb.conf %D/etc/smb.conf.default; then rm -f %D/etc/smb.conf; fi
+etc/smb.conf.default
 sbin/smbd
+sbin/nmbd
 sbin/swat
-%%WINBINDD%%sbin/winbindd
+%%WINBIND%%sbin/winbindd
+include/libsmbclient.h
+lib/samba/lowcase.dat
+lib/samba/upcase.dat
+lib/samba/valid.dat
+lib/samba/de.msg
+lib/samba/en.msg
+lib/samba/fr.msg
+lib/samba/it.msg
+lib/samba/ja.msg
+lib/samba/nl.msg
+lib/samba/pl.msg
+lib/samba/tr.msg
+lib/samba/vfs/audit.so
+lib/samba/vfs/cap.so
+lib/samba/vfs/default_quota.so
+lib/samba/vfs/extd_audit.so
+lib/samba/vfs/fake_perms.so
+lib/samba/vfs/netatalk.so
+lib/samba/vfs/readonly.so
+lib/samba/vfs/recycle.so
+lib/samba/charset/CP437.so
+lib/samba/charset/CP850.so
+%%SAMMYSQL%%lib/samba/pdb/mysql.so
+%%SAMPGSQL%%lib/samba/pdb/pgsql.so
+%%SAMXML%%lib/samba/pdb/xml.so
+lib/libsmbclient.a
+lib/libsmbclient.so
+lib/libsmbclient.so.0
+%%WINBIND%%lib/nss_winbind.so.1
+%%WINBIND%%lib/nss_wins.so.1
+%%WINBIND%%lib/pam_winbind.so
+%%SMBPASS%%lib/pam_smbpass.so
 %%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
@@ -35,29 +71,15 @@ sbin/swat
 %%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/WHATSNEW.txt
 %%PORTDOCS%%share/doc/samba/history
-%%PORTDOCS%%share/doc/samba/Registry/FolderRedir.adm
-%%PORTDOCS%%share/doc/samba/Registry/NT4-Locking.reg
-%%PORTDOCS%%share/doc/samba/Registry/NT4_PlainPassword.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
-%%PORTDOCS%%share/doc/samba/Registry/Win9X-CacheHandling.reg
-%%PORTDOCS%%share/doc/samba/Registry/WinME_PlainPassword.reg
-%%PORTDOCS%%share/doc/samba/Registry/WinXP_PlainPassword.reg
-%%PORTDOCS%%share/doc/samba/Registry/WinXP_SignOrSeal.reg
-%%PORTDOCS%%share/doc/samba/Registry/WindowsTerminalServer.reg
 %%PORTDOCS%%share/doc/samba/faq/FAQ-ClientApp.html
 %%PORTDOCS%%share/doc/samba/faq/FAQ-Install.html
 %%PORTDOCS%%share/doc/samba/faq/FAQ-errors.html
@@ -121,9 +143,9 @@ sbin/swat
 %%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
@@ -156,42 +178,113 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/htmldocs/wbinfo.1.html
 %%PORTDOCS%%share/doc/samba/htmldocs/winbind.html
 %%PORTDOCS%%share/doc/samba/htmldocs/winbindd.8.html
+%%PORTDOCS%%share/doc/samba/htmldocs/images/10small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/11small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/12small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/13small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/14small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/1small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/2small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/3small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/4small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/5small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/6small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/7small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/8small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/9small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/a_small.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/access1.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/browsing1.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/cups1.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/cups2.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/domain.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/ethereal1.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/ethereal2.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-gid2sid.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-groups.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-sid2gid.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-sid2uid.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-store-gid2sid.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap-uid2sid.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/idmap_winbind_no_loop.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/pdftoepsonusb.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/pdftosocket.png
+%%PORTDOCS%%share/doc/samba/htmldocs/images/trusts1.png
+%%PORTDOCS%%share/doc/samba/Registry/FolderRedir.adm
+%%PORTDOCS%%share/doc/samba/Registry/NT4-Locking.reg
+%%PORTDOCS%%share/doc/samba/Registry/NT4_PlainPassword.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
+%%PORTDOCS%%share/doc/samba/Registry/Win9X-CacheHandling.reg
+%%PORTDOCS%%share/doc/samba/Registry/WinME_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/WinXP_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/WinXP_SignOrSeal.reg
+%%PORTDOCS%%share/doc/samba/Registry/WindowsTerminalServer.reg
+%%SMBPASS%%share/examples/samba/pam_smbpass/README
+%%SMBPASS%%share/examples/samba/pam_smbpass/kdc-pdc
+%%SMBPASS%%share/examples/samba/pam_smbpass/password-mature
+%%SMBPASS%%share/examples/samba/pam_smbpass/password-migration
+%%SMBPASS%%share/examples/samba/pam_smbpass/password-sync
+%%PYTHON%%share/examples/samba/python/tdbpack/.cvsignore
+%%PYTHON%%share/examples/samba/python/tdbpack/oldtdbutil.py
+%%PYTHON%%share/examples/samba/python/tdbpack/tdbtimetrial.py
+%%PYTHON%%share/examples/samba/python/tdbpack/test_tdbpack.py
+%%PYTHON%%share/examples/samba/python/spoolss/changeid.py
+%%PYTHON%%share/examples/samba/python/spoolss/enumprinters.py
+%%PYTHON%%share/examples/samba/python/spoolss/psec.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/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.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/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/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/README
+share/examples/samba/LDAP/convertSambaAccount
+share/examples/samba/LDAP/ldapsync.pl
+share/examples/samba/LDAP/samba-nds.schema
+share/examples/samba/LDAP/samba-schema-netscapeds4.x
+share/examples/samba/LDAP/samba-schema-netscapeds5.x
+share/examples/samba/LDAP/samba-schema.IBMSecureWay
+share/examples/samba/LDAP/samba.schema
+share/examples/samba/LDAP/samba.schema.at.IBM-DS
+share/examples/samba/LDAP/samba.schema.oc.IBM-DS
+share/examples/samba/LDAP/smbldap-tools/CONTRIBUTORS
 share/examples/samba/LDAP/smbldap-tools/COPYING
-share/examples/samba/LDAP/smbldap-tools/Makefile
+share/examples/samba/LDAP/smbldap-tools/ChangeLog
 share/examples/samba/LDAP/smbldap-tools/FILES
-share/examples/samba/LDAP/smbldap-tools/INSTALL
 share/examples/samba/LDAP/smbldap-tools/INFRASTRUCTURE
+share/examples/samba/LDAP/smbldap-tools/INSTALL
+share/examples/samba/LDAP/smbldap-tools/Makefile
 share/examples/samba/LDAP/smbldap-tools/README
 share/examples/samba/LDAP/smbldap-tools/TODO
+share/examples/samba/LDAP/smbldap-tools/cgi/README
+share/examples/samba/LDAP/smbldap-tools/cgi/ldappass.cgi
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/Makefile
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.h
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/md4.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.h
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/smbdes.c
 share/examples/samba/LDAP/smbldap-tools/smbldap-groupadd.pl
 share/examples/samba/LDAP/smbldap-tools/smbldap-groupdel.pl
 share/examples/samba/LDAP/smbldap-tools/smbldap-groupmod.pl
@@ -206,72 +299,59 @@ share/examples/samba/LDAP/smbldap-tools/smbldap-userdel.pl
 share/examples/samba/LDAP/smbldap-tools/smbldap-usermod.pl
 share/examples/samba/LDAP/smbldap-tools/smbldap-usershow.pl
 share/examples/samba/LDAP/smbldap-tools/smbldap_conf.pm
-share/examples/samba/LDAP/smbldap-tools/CONTRIBUTORS
 share/examples/samba/LDAP/smbldap-tools/smbldap_tools.pm
-share/examples/samba/LDAP/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/readme.prtpub
 share/examples/samba/printing/smbprint
+share/examples/samba/printing/smbprint-new.sh
 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/hp5-redir
 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/README
 share/examples/samba/VFS/Makefile.in
+share/examples/samba/VFS/README
 share/examples/samba/VFS/autogen.sh
 share/examples/samba/VFS/configure.in
 share/examples/samba/VFS/install-sh
-share/examples/samba/VFS/skel_opaque.c
 share/examples/samba/VFS/shadow_copy_test.c
-share/examples/samba/ntlogon/ntlogon.conf
+share/examples/samba/VFS/skel_opaque.c
+share/examples/samba/VFS/skel_transparent.c
 share/examples/samba/ntlogon/README
+share/examples/samba/ntlogon/ntlogon.conf
 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/wins_hook/dns_update
 share/examples/samba/misc/extra_smbstatus
-share/examples/samba/misc/wall.perl
+share/examples/samba/misc/modify_samba_config.pl
 share/examples/samba/misc/swat.pl
-share/examples/samba/libsmbclient/testsmbc.c
+share/examples/samba/misc/wall.perl
 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/libsmbclient/testsmbc.c
+share/examples/samba/libsmbclient/tree.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/auth/auth_skel.c
 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/nss/wbtest.c
 share/examples/samba/nss/nss_winbind.c
 share/examples/samba/nss/nss_winbind.h
+share/examples/samba/nss/wbtest.c
 share/examples/samba/README
 share/examples/samba/smb.conf.default
-share/swat/help/welcome.html
 share/swat/help/AccessControls.html
 share/swat/help/AdvancedNetworkManagement.html
 share/swat/help/Appendixes.html
@@ -288,8 +368,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/SWAT.html
 share/swat/help/ProfileMgmt.html
+share/swat/help/SWAT.html
 share/swat/help/Samba-Developers-Guide.html
 share/swat/help/Samba-HOWTO-Collection.html
 share/swat/help/SambaHA.html
@@ -329,7 +409,6 @@ 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
@@ -338,6 +417,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
@@ -361,6 +441,7 @@ 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
@@ -552,67 +633,35 @@ 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
-@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
-@dirrm share/swat/images
-@dirrm share/swat/help
-@dirrm share/swat/lang/ja/include
-@dirrm share/swat/lang/ja/images
-@dirrm share/swat/lang/ja/help
-@dirrm share/swat/lang/ja
 @dirrm share/swat/lang/tr/include
 @dirrm share/swat/lang/tr/images
 @dirrm share/swat/lang/tr/help
 @dirrm share/swat/lang/tr
+@dirrm share/swat/lang/ja/include
+@dirrm share/swat/lang/ja/images
+@dirrm share/swat/lang/ja/help
+@dirrm share/swat/lang/ja
 @dirrm share/swat/lang
+@dirrm share/swat/include
+@dirrm share/swat/images
+@dirrm share/swat/help
 @dirrm share/swat
-@dirrm share/examples/samba/LDAP/smbldap-tools/cgi
-@dirrm share/examples/samba/LDAP/smbldap-tools/mkntpwd
-@dirrm share/examples/samba/LDAP/smbldap-tools
-@dirrm share/examples/samba/LDAP
+%%SMBPASS%%@dirrm share/examples/samba/pam_smbpass
+%%PYTHON%%@dirrm share/examples/samba/python/spoolss
+%%PYTHON%%@dirrm share/examples/samba/python/tdbpack
+%%PYTHON%%@dirrm share/examples/samba/python
+@dirrm share/examples/samba/wins_hook
 @dirrm share/examples/samba/validchars
 @dirrm share/examples/samba/tridge
 @dirrm share/examples/samba/thoralf
 @dirrm share/examples/samba/svr4-startup
 @dirrm share/examples/samba/simple
 @dirrm share/examples/samba/printing
+@dirrm share/examples/samba/printer-accounting
 @dirrm share/examples/samba/pdb/mysql
 @dirrm share/examples/samba/pdb
-@dirrm share/examples/samba/printer-accounting
 @dirrm share/examples/samba/ntlogon
 @dirrm share/examples/samba/nss
 @dirrm share/examples/samba/misc
@@ -623,11 +672,30 @@ share/swat/using_samba/samba2_xs.gif
 @dirrm share/examples/samba/auth
 @dirrm share/examples/samba/appliance
 @dirrm share/examples/samba/VFS
-@dirrm share/examples/samba/wins_hook
+@dirrm share/examples/samba/LDAP/smbldap-tools/mkntpwd
+@dirrm share/examples/samba/LDAP/smbldap-tools/cgi
+@dirrm share/examples/samba/LDAP/smbldap-tools
+@dirrm share/examples/samba/LDAP
 @dirrm share/examples/samba
+@dirrm lib/samba/vfs
+@dirrm lib/samba/rpc
+@dirrm lib/samba/pdb
+@dirrm lib/samba/idmap
+@dirrm lib/samba/charset
+@dirrm lib/samba/auth
+@dirrm lib/samba
+%%PYTHON%%@dirrm lib/%%PYTHON_VERSION%%/site-packages/samba
 %%PORTDOCS%%@dirrm share/doc/samba/Registry
+%%PORTDOCS%%@dirrm share/doc/samba/htmldocs/images
 %%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."
+@exec mkdir -p %%SAMBA_SPOOL%% || true
+@exec chmod 1777 %%SAMBA_SPOOL%%
+@unexec rm -fr %%SAMBA_SPOOL%%/printing
+@unexec for file in `ls %%SAMBA_SPOOL%% | grep -v '^winbindd_'`; do rm -fr %%SAMBA_SPOOL%%/$file; done
+@unexec rmdir %%SAMBA_SPOOL%% 2>/dev/null || true
+@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %%SAMBA_SPOOL%%/*.tdb manually."
+@exec mkdir -p %%SAMBA_LOGDIR%% || true
+@unexec rmdir %%SAMBA_LOGDIR%% 2>/dev/null || true
+@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %%SAMBA_LOGDIR%% manually."