Update to 3.0.3.p2 (aka pre2), which containes

a lot of imporvements and bugfixes since 3.0.2a.

In addition following problems solved:
 o linking agaist libiconv is mandatary now
 o more ways of detecting Kerberos5 installation and
   LIB_DEPENDS on Heimdal port if none is found -
   should address problems with bentoo building as well
 o fixed problem when port wasn't compilable when LDAP
   wasn't chosen and ADS was.

Submitted by:	Timur Bakeyev <timur@gnu.org> (maintainer)
PR:		65237

10 files changed, 548 insertions, 383 deletions

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 3938272b2c0d..c0df5d6608a3 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0.2a
-PORTREVISION?=	1
+PORTVERSION=	3.0.3.p2
+PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	. rc
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/}
+MASTER_SITE_SUBDIR=	pre rc .
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
 
 MAINTAINER?=	timur@gnu.org
 COMMENT?=	A free SMB and CIFS client and server for UNIX
@@ -20,6 +20,7 @@ COMMENT?=	A free SMB and CIFS client and server for UNIX
 CONFLICTS?=	ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.*
 
 USE_BZIP2=	yes
+USE_ICONV=	yes
 # directories
 VARDIR=		${DESTDIR}/var
 SAMBA_SPOOL?=	${VARDIR}/spool/samba
@@ -29,8 +30,6 @@ SAMBA_PRIVATE?=	${PREFIX}/private
 SAMBA_CONFDIR?=	${PREFIX}/etc
 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
 
@@ -38,16 +37,17 @@ 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-libdir=${SAMBA_LIBDIR}/samba \
 		--with-swatdir=${SAMBA_SWATDIR} \
-		--with-sambabook=${SAMBA_SWATDIR}/using_samba \
 		--with-lockdir=${SAMBA_SPOOL} --with-piddir=${SAMBA_RUNDIR} \
 		--with-privatedir=${SAMBA_PRIVATE} \
 		--with-logfilebase=${SAMBA_LOGDIR} \
 		--with-manpages-langs=en
 
+CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE}
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
 # SUBPORTS end here
@@ -74,13 +74,13 @@ OPTIONS=	CUPS		"With CUPS printing support" on \
 		SAM_PGSQL	"With PostgreSQL smbpasswd backend" off \
 		SAM_OLD_LDAP	"With Samba2.x LDAP smbpasswd backend" off \
 		PAM_SMBPASS	"With SMB PAM module" off \
+		CRACKLIB	"With Cracklib password verification" off \
 		PYTHON		"With Python experimental bindings" off \
-		LIBICONV	"With installed ICONV library" off \
 		POPT		"With installed POPT library" on
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ARGS+=	--with-pam --with-readline \
+CONFIGURE_ARGS+=	--with-pam --with-readline --with-sendfile-support \
 			--with-libsmbclient
 
 .if defined(WITH_PYTHON)
@@ -106,6 +106,8 @@ CUPS=			""
 
 .if defined(WITH_SYSLOG)
 CONFIGURE_ARGS+=	--with-syslog
+.else
+CONFIGURE_ARGS+=	--without-syslog
 .endif
 
 .if defined(WITH_QUOTAS)
@@ -147,9 +149,6 @@ CONFIGURE_ARGS+=	--without-ads
 
 .if !defined(WITHOUT_LDAP)
 WANT_LDAP=		yes
-CONFIGURE_ARGS+=	--with-ldap
-.else
-CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 # SAM
@@ -196,14 +195,19 @@ CONFIGURE_ARGS+=	--with-expsam=${WANT_EXPSAM_MODULES}
 
 # Kerberos5 is necessary for ADS
 .if defined(WANT_KRB5)
-.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
+# Relay on PATH
+KRB5_PREFIX!=		krb5-config --prefix
+.if defined(KRB5_PREFIX)
+CONFIGURE_ARGS+=	--with-krb5=${KRB5_PREFIX}
+.elif defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
 CONFIGURE_ARGS+=	--with-krb5=${KRB5_HOME}
 .elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
 CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
 .elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=	--with-krb5=${DESTDIR}/usr
 .else
-BROKEN=			"Kerberos5 is necessary for ADS support. Please, install either Heimdal or MIT-Kerberos"
+#BROKEN=		"Kerberos5 is necessary for ADS support. Please, install either Heimdal or MIT-Kerberos"
+LIB_DEPENDS+=		krb5.19:${PORTSDIR}/security/heimdal
 .endif
 .else
 CONFIGURE_ARGS+=	--without-krb5
@@ -211,6 +215,9 @@ CONFIGURE_ARGS+=	--without-krb5
 
 .if defined(WANT_LDAP)
 USE_OPENLDAP=		yes
+CONFIGURE_ARGS+=	--with-ldap
+.else
+CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 .if defined(WITH_PAM_SMBPASS)
@@ -221,6 +228,13 @@ CONFIGURE_ARGS+=	--without-pam_smbpass
 PLIST_SUB+=		SMBPASS="@comment "
 .endif
 
+.if defined(WITH_CRACKLIB)
+LIB_DEPENDS+=		crack.1:${PORTSDIR}/security/cracklib
+CONFIGURE_ARGS+=	--with-cracklib=${LOCALBASE}/libdata/cracklib/pw_dict
+.else
+CONFIGURE_ARGS+=	--without-cracklib
+.endif
+
 .if defined(WITH_ACL_SUPPORT)
 .if ${OSVERSION} < 500018
 BROKEN=			"Requires FreeBSD 5.x at least after 20010326"
@@ -229,14 +243,6 @@ CONFIGURE_ARGS+=	--with-acl-support
 .endif
 .endif
 
-.if defined(WITH_LIBICONV)
-.if exists(${LOCALBASE}/lib/libbiconv.so)
-BROKEN=			"Installed iconv-2.* port breaks detection of the character conversion. Please deinstall it first, if you want to use this feature"
-.endif
-USE_ICONV=		yes
-CONFIGURE_ARGS+=	--with-libiconv
-.endif
-
 .if !defined(WITHOUT_POPT)
 LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
 .else
@@ -276,9 +282,9 @@ RC_SCRIPTS_SUB=		PREFIX=${PREFIX} \
 			SAMBA_RUNDIR=${SAMBA_RUNDIR}
 
 pre-fetch:
-	@${ECHO_MSG} "===> -------------------------------------------"
-	@${ECHO_MSG} "===> Run 'make config' to (re)configure the port"
-	@${ECHO_MSG} "===> -------------------------------------------"
+	@${ECHO_MSG} "===>  -------------------------------------------"
+	@${ECHO_MSG} "===>  Run 'make config' to (re)configure the port"
+	@${ECHO_MSG} "===>  -------------------------------------------"
 
 post-install:
 .for sect in 1 5 7 8
@@ -302,7 +308,7 @@ post-install:
 	@${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_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && ${CHMOD} 0755 ${SAMBA_SPOOL}
 	@test -d ${SAMBA_LOGDIR} || ${MKDIR} ${SAMBA_LOGDIR}
 	${SED}  -e 's!%%SAMBA_SPOOL%%!${SAMBA_SPOOL}!'			\
 		-e 's!%%SAMBA_LOGDIR%%!${SAMBA_LOGDIR}!'		\
@@ -315,21 +321,13 @@ post-install:
 		${CHOWN} root:wheel ${SAMBA_PRIVATE} ;			\
 	fi
 	${CHMOD} 700 ${SAMBA_PRIVATE}
-	if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then			\
-		${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} "@exec ${MKDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 500 ${SAMBA_PRIVATE}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHMOD} 700 ${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 %D/private/* manually.\"" >> ${TMPPLIST}
 .endif
-	-@${LN} -snf libsmbclient.so.0 ${SAMBA_LIBDIR}/libsmbclient.so
 .if !defined(WITHOUT_WINBIND)
 .if defined(WITH_WINBIND_NSS)
 	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1
@@ -340,6 +338,7 @@ post-install:
 .if defined(WITH_PAM_SMBPASS)
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
 .endif
+	-@${LN} -snf libsmbclient.so.0 ${SAMBA_LIBDIR}/libsmbclient.so
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
@@ -362,6 +361,7 @@ post-install:
 		done							\
 	done
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
 
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index da59ee4b4d3e..9027a722700f 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1,2 +1,2 @@
-MD5 (samba-3.0.2a.tar.bz2) = 72979a30ac450c8b0567c1ac9886884a
-SIZE (samba-3.0.2a.tar.bz2) = 9289178
+MD5 (samba-3.0.3pre2.tar.bz2) = 47464715c375bf4b17453dc534337111
+SIZE (samba-3.0.3pre2.tar.bz2) = 9347649
diff --git a/net/samba3/files/README.FreeBSD b/net/samba3/files/README.FreeBSD
index 24234b687c89..5bc20d291549 100644
--- a/net/samba3/files/README.FreeBSD
+++ b/net/samba3/files/README.FreeBSD
@@ -18,4 +18,4 @@ use NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to
 yes and use smbpasswd [username] to use /usr/local/private/smbpasswd for
 authentication.
 
-FreeBSD SAMBA ports maintainer: Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
+FreeBSD Samba-devel port maintainer: Timur Bakeyev <timur@gnu.org>
diff --git a/net/samba3/files/patch-Makefile.in b/net/samba3/files/patch-Makefile.in
index 05811dbdd358..efeaa5e5b20e 100644
--- a/net/samba3/files/patch-Makefile.in
+++ b/net/samba3/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Feb  6 23:40:27 2004
-+++ Makefile.in	Thu Mar  4 05:47:34 2004
+--- Makefile.in.orig	Sun Apr  4 09:37:15 2004
++++ Makefile.in	Mon Apr  5 20:43:42 2004
 @@ -101,6 +101,7 @@
  LIBSMBCLIENT_MAJOR=0
  LIBSMBCLIENT_MINOR=1
@@ -8,7 +8,7 @@
  
  FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)
  FLAGS2 = 
-@@ -951,8 +952,8 @@
+@@ -957,8 +958,8 @@
  		@SONAMEFLAG@`basename $@`
  
  bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
@@ -19,7 +19,7 @@
  		$(KRB5LIBS) $(LDAP_LIBS) \
  		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
  
-@@ -1035,13 +1036,13 @@
+@@ -1041,13 +1042,13 @@
  @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
  	@echo "Linking $@"
  	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
@@ -35,7 +35,7 @@
  
  nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
  	@echo "Linking $@"
-@@ -1204,7 +1205,7 @@
+@@ -1218,7 +1219,7 @@
  
  bin/t_snprintf@EXEEXT@: lib/snprintf.c
  	$(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm
@@ -44,7 +44,7 @@
  
  install-everything: install installmodules
  
-@@ -1256,7 +1257,7 @@
+@@ -1270,7 +1271,7 @@
  
  installclientlib: installdirs libsmbclient
  	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib
@@ -53,21 +53,3 @@
  	-$(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/samba3/files/patch-aclocal.m4 b/net/samba3/files/patch-aclocal.m4
new file mode 100644
index 000000000000..36c172411d1e
--- /dev/null
+++ b/net/samba3/files/patch-aclocal.m4
@@ -0,0 +1,104 @@
+--- aclocal.m4.orig	Sat Apr  3 22:30:01 2004
++++ aclocal.m4	Sat Apr  3 22:33:24 2004
+@@ -564,89 +564,20 @@
+     jm_cv_lib_iconv=""
+     jm_cv_giconv=no
+     jm_save_LIBS="$LIBS"
+-    LIBS="$LIBS -lbiconv"
+-    AC_TRY_LINK([#include <stdlib.h>
+-#include <biconv.h>],
+-        [iconv_t cd = iconv_open("","");
+-         iconv(cd,NULL,NULL,NULL,NULL);
+-         iconv_close(cd);],
+-      jm_cv_func_iconv=yes
+-      jm_cv_biconv=yes
+-      jm_cv_include="biconv.h"
+-      jm_cv_lib_iconv="biconv")
+-      LIBS="$jm_save_LIBS"
+-
+-    dnl Check for include in funny place but no lib needed
+-    if test "$jm_cv_func_iconv" != yes; then 
+-      AC_TRY_LINK([#include <stdlib.h>
+-#include <giconv.h>],
+-        [iconv_t cd = iconv_open("","");
+-         iconv(cd,NULL,NULL,NULL,NULL);
+-         iconv_close(cd);],
+-         jm_cv_func_iconv=yes
+-         jm_cv_include="giconv.h"
+-         jm_cv_giconv="yes"
+-         jm_cv_lib_iconv="")
+-
+-      dnl Standard iconv.h include, lib in glibc or libc ...
+-      if test "$jm_cv_func_iconv" != yes; then
+-        AC_TRY_LINK([#include <stdlib.h>
++    LIBS="$LIBS -liconv"
++  AC_TRY_LINK([#include <stdlib.h>
+ #include <iconv.h>],
+-          [iconv_t cd = iconv_open("","");
+-           iconv(cd,NULL,NULL,NULL,NULL);
+-           iconv_close(cd);],
+-           jm_cv_include="iconv.h"
+-           jm_cv_func_iconv=yes
+-           jm_cv_lib_iconv="")
+-
+-          if test "$jm_cv_lib_iconv" != yes; then
+-            jm_save_LIBS="$LIBS"
+-            LIBS="$LIBS -lgiconv"
+-            AC_TRY_LINK([#include <stdlib.h>
+-#include <giconv.h>],
+-              [iconv_t cd = iconv_open("","");
+-               iconv(cd,NULL,NULL,NULL,NULL);
+-               iconv_close(cd);],
+-              jm_cv_lib_iconv=yes
+-              jm_cv_func_iconv=yes
+-              jm_cv_include="giconv.h"
+-              jm_cv_giconv=yes
+-              jm_cv_lib_iconv="giconv")
+-
+-           LIBS="$jm_save_LIBS"
+-
+-        if test "$jm_cv_func_iconv" != yes; then
+-          jm_save_LIBS="$LIBS"
+-          LIBS="$LIBS -liconv"
+-          AC_TRY_LINK([#include <stdlib.h>
+-#include <iconv.h>],
+-            [iconv_t cd = iconv_open("","");
+-             iconv(cd,NULL,NULL,NULL,NULL);
+-             iconv_close(cd);],
+-            jm_cv_include="iconv.h"
+-            jm_cv_func_iconv=yes
+-            jm_cv_lib_iconv="iconv")
+-          LIBS="$jm_save_LIBS"
+-        fi
+-      fi
+-    fi
+-  fi
++    [iconv_t cd = iconv_open("","");
++     iconv(cd,NULL,NULL,NULL,NULL);
++     iconv_close(cd);],
++    jm_cv_include="iconv.h"
++    jm_cv_func_iconv=yes
++    jm_cv_lib_iconv="iconv")
++    LIBS="$jm_save_LIBS"
+   if test "$jm_cv_func_iconv" = yes; then
+-    if test "$jm_cv_giconv" = yes; then
+-      AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
+-      AC_MSG_RESULT(yes)
+-      ICONV_FOUND=yes
+-    else
+-      if test "$jm_cv_biconv" = yes; then
+-        AC_DEFINE(HAVE_BICONV, 1, [What header to include for iconv() function: biconv.h])
+-        AC_MSG_RESULT(yes)
+-        ICONV_FOUND=yes
+-      else 
+-        AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
+-        AC_MSG_RESULT(yes)
+-        ICONV_FOUND=yes
+-      fi
+-    fi
++    AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
++    AC_MSG_RESULT(yes)
++    ICONV_FOUND=yes
+   else
+     AC_MSG_RESULT(no)
+   fi
diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in
index bdba5d47cd7c..88a46040b022 100644
--- a/net/samba3/files/patch-configure.in
+++ b/net/samba3/files/patch-configure.in
@@ -1,6 +1,14 @@
---- configure.in.orig	Sat Jan 31 04:40:54 2004
-+++ configure.in	Sat Jan 31 04:43:23 2004
-@@ -4037,6 +4037,8 @@
+--- configure.in.orig	Sun Apr  4 09:37:25 2004
++++ configure.in	Mon Apr  5 21:21:58 2004
+@@ -2983,7 +2983,6 @@
+ 
+ 
+ dictpath="/usr/lib/cracklib_dict"
+-with_cracklib=yes
+ ###############################################
+ # test for where we get FaciestCheck from
+ AC_MSG_CHECKING(where to use cracklib from (default=$dictpath))
+@@ -4118,6 +4117,8 @@
  		# the Linux version.
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
  		    nsswitch/winbind_nss_linux.o"
diff --git a/net/samba3/files/patch-smbd_chgpasswd.c b/net/samba3/files/patch-smbd_chgpasswd.c
new file mode 100644
index 000000000000..104ead0ff325
--- /dev/null
+++ b/net/samba3/files/patch-smbd_chgpasswd.c
@@ -0,0 +1,10 @@
+--- smbd/chgpasswd.c.orig	Mon Apr  5 21:33:21 2004
++++ smbd/chgpasswd.c	Mon Apr  5 21:33:34 2004
+@@ -49,7 +49,6 @@
+ #include "includes.h"
+ 
+ #ifdef HAVE_WORKING_CRACKLIB
+-#include <crack.h>
+ 
+ #ifndef HAVE_CRACKLIB_DICTPATH
+ #ifndef CRACKLIB_DICTPATH
diff --git a/net/samba3/files/patch-tests_crack.c b/net/samba3/files/patch-tests_crack.c
new file mode 100644
index 000000000000..6d62851c7d7d
--- /dev/null
+++ b/net/samba3/files/patch-tests_crack.c
@@ -0,0 +1,8 @@
+--- tests/crack.c.orig	Sat Apr  3 18:04:05 2004
++++ tests/crack.c	Sat Apr  3 01:12:18 2004
+@@ -1,5 +1,3 @@
+-#include <crack.h>
+-
+ #ifndef HAVE_CRACKLIB_DICTPATH
+ #ifndef CRACKLIB_DICTPATH
+ #define CRACKLIB_DICTPATH SAMBA_CRACKLIB_DICTPATH
diff --git a/net/samba3/pkg-message b/net/samba3/pkg-message
new file mode 100644
index 000000000000..1eaf5aeb529e
--- /dev/null
+++ b/net/samba3/pkg-message
@@ -0,0 +1,18 @@
+******************************************************************************
+Starting from Samba 3.0.3 this port doesn't create 'smbpasswd' file
+automatically. Users are encouraged to use 'tdbsam' backend instead:
+
+  [global]
+    passdb backend = tdbsam, smbpasswd
+
+You can use pdbedit to migrate accounts from 'smbpasswd' to 'tdbsam',
+see the Samba-HOWTO-Collection.
+
+You still can create 'smbpasswd' file with the supplied 'make_smbpasswd'
+script:
+
+  cat /etc/passwd | grep -v "^#" | make_smbpasswd > smbpasswd
+  chmod 600 smbpasswd
+
+But the usage of it is deprecated.
+******************************************************************************
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 29cbb00468ea..7c0c8525276a 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -43,6 +43,7 @@ lib/samba/tr.msg
 lib/samba/vfs/audit.so
 lib/samba/vfs/cap.so
 lib/samba/vfs/default_quota.so
+lib/samba/vfs/expand_msdfs.so
 lib/samba/vfs/extd_audit.so
 lib/samba/vfs/fake_perms.so
 lib/samba/vfs/netatalk.so
@@ -71,287 +72,287 @@ lib/libsmbclient.so.0
 %%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/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/THANKS
-%%PORTDOCS%%share/doc/samba/WHATSNEW.txt
-%%PORTDOCS%%share/doc/samba/history
-%%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/htmldocs/AccessControls.html
-%%PORTDOCS%%share/doc/samba/htmldocs/AdvancedNetworkManagement.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Appendixes.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Backup.html
-%%PORTDOCS%%share/doc/samba/htmldocs/CUPS-printing.html
-%%PORTDOCS%%share/doc/samba/htmldocs/ClientConfig.html
-%%PORTDOCS%%share/doc/samba/htmldocs/DNSDHCP.html
-%%PORTDOCS%%share/doc/samba/htmldocs/FastStart.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Further-Resources.html
-%%PORTDOCS%%share/doc/samba/htmldocs/InterdomainTrusts.html
-%%PORTDOCS%%share/doc/samba/htmldocs/IntroSMB.html
-%%PORTDOCS%%share/doc/samba/htmldocs/NT4Migration.html
-%%PORTDOCS%%share/doc/samba/htmldocs/NetworkBrowsing.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Other-Clients.html
-%%PORTDOCS%%share/doc/samba/htmldocs/PolicyMgmt.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Portability.html
-%%PORTDOCS%%share/doc/samba/htmldocs/ProfileMgmt.html
-%%PORTDOCS%%share/doc/samba/htmldocs/SWAT.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-Developers-Guide.html
-%%PORTDOCS%%share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
-%%PORTDOCS%%share/doc/samba/htmldocs/SambaHA.html
-%%PORTDOCS%%share/doc/samba/htmldocs/ServerType.html
-%%PORTDOCS%%share/doc/samba/htmldocs/StandAloneServer.html
-%%PORTDOCS%%share/doc/samba/htmldocs/VFS.html
-%%PORTDOCS%%share/doc/samba/htmldocs/bugreport.html
-%%PORTDOCS%%share/doc/samba/htmldocs/compiling.html
-%%PORTDOCS%%share/doc/samba/htmldocs/diagnosis.html
-%%PORTDOCS%%share/doc/samba/htmldocs/domain-member.html
-%%PORTDOCS%%share/doc/samba/htmldocs/editreg.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/findsmb.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/groupmapping.html
-%%PORTDOCS%%share/doc/samba/htmldocs/index.html
-%%PORTDOCS%%share/doc/samba/htmldocs/install.html
-%%PORTDOCS%%share/doc/samba/htmldocs/integrate-ms-networks.html
-%%PORTDOCS%%share/doc/samba/htmldocs/introduction.html
-%%PORTDOCS%%share/doc/samba/htmldocs/ix01.html
-%%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html
-%%PORTDOCS%%share/doc/samba/htmldocs/locking.html
-%%PORTDOCS%%share/doc/samba/htmldocs/log2pcap.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/migration.html
-%%PORTDOCS%%share/doc/samba/htmldocs/mount.cifs.8.html
-%%PORTDOCS%%share/doc/samba/htmldocs/msdfs.html
-%%PORTDOCS%%share/doc/samba/htmldocs/net.8.html
-%%PORTDOCS%%share/doc/samba/htmldocs/nmbd.8.html
-%%PORTDOCS%%share/doc/samba/htmldocs/nmblookup.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/ntlm_auth.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/optional.html
-%%PORTDOCS%%share/doc/samba/htmldocs/pam.html
-%%PORTDOCS%%share/doc/samba/htmldocs/passdb.html
-%%PORTDOCS%%share/doc/samba/htmldocs/pdbedit.8.html
-%%PORTDOCS%%share/doc/samba/htmldocs/pr01.html
-%%PORTDOCS%%share/doc/samba/htmldocs/pr02.html
-%%PORTDOCS%%share/doc/samba/htmldocs/printing.html
-%%PORTDOCS%%share/doc/samba/htmldocs/problems.html
-%%PORTDOCS%%share/doc/samba/htmldocs/profiles.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/rpcclient.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/samba-bdc.html
-%%PORTDOCS%%share/doc/samba/htmldocs/samba-pdc.html
-%%PORTDOCS%%share/doc/samba/htmldocs/samba.7.html
-%%PORTDOCS%%share/doc/samba/htmldocs/samba.css
-%%PORTDOCS%%share/doc/samba/htmldocs/securing-samba.html
-%%PORTDOCS%%share/doc/samba/htmldocs/smb.conf.5.html
-%%PORTDOCS%%share/doc/samba/htmldocs/smbcacls.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/smbclient.1.html
-%%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
-%%PORTDOCS%%share/doc/samba/htmldocs/smbpasswd.8.html
-%%PORTDOCS%%share/doc/samba/htmldocs/smbsh.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/smbspool.8.html
-%%PORTDOCS%%share/doc/samba/htmldocs/smbstatus.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/smbtar.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/smbtree.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/smbumount.8.html
-%%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
-%%PORTDOCS%%share/doc/samba/htmldocs/type.html
-%%PORTDOCS%%share/doc/samba/htmldocs/unicode.html
-%%PORTDOCS%%share/doc/samba/htmldocs/upgrading-to-3.0.html
-%%PORTDOCS%%share/doc/samba/htmldocs/vfstest.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/wbinfo.1.html
-%%PORTDOCS%%share/doc/samba/htmldocs/winbind.html
-%%PORTDOCS%%share/doc/samba/htmldocs/winbindd.8.html
-%%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/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/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/thoralf/smb.conf
-share/examples/samba/svr4-startup/samba.server
-share/examples/samba/svr4-startup/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/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/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
-share/examples/samba/LDAP/smbldap-tools/smbldap-groupshow.pl
-share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-accounts.pl
-share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-groups.pl
-share/examples/samba/LDAP/smbldap-tools/smbldap-passwd.pl
-share/examples/samba/LDAP/smbldap-tools/smbldap-populate.pl
-share/examples/samba/LDAP/smbldap-tools/smbldap-tools.spec
-share/examples/samba/LDAP/smbldap-tools/smbldap-useradd.pl
-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/smbldap_tools.pm
-share/examples/samba/simple/README
-share/examples/samba/simple/smb.conf
-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/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/.cvsignore
-share/examples/samba/VFS/Makefile.in
-share/examples/samba/VFS/README
-share/examples/samba/VFS/autogen.sh
-share/examples/samba/VFS/configure.in
-share/examples/samba/VFS/install-sh
-share/examples/samba/VFS/shadow_copy_test.c
-share/examples/samba/VFS/skel_opaque.c
-share/examples/samba/VFS/skel_transparent.c
-share/examples/samba/ntlogon/README
-share/examples/samba/ntlogon/ntlogon.conf
-share/examples/samba/ntlogon/ntlogon.py
-share/examples/samba/wins_hook/README
-share/examples/samba/wins_hook/dns_update
-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/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/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/Makefile
-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/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
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/Manifest
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
+%%PORTDOCS%%%%DOCSDIR%%/Read-Manifest-Now
+%%PORTDOCS%%%%DOCSDIR%%/Roadmap
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt
+%%PORTDOCS%%%%DOCSDIR%%/history
+%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-ClientApp.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-Install.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-errors.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-features.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/FAQ-general.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/samba-faq.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/AccessControls.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/AdvancedNetworkManagement.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Appendixes.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Backup.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/CUPS-printing.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/ClientConfig.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/DNSDHCP.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/FastStart.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Further-Resources.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/InterdomainTrusts.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/IntroSMB.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/NT4Migration.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/NetworkBrowsing.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Other-Clients.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/PolicyMgmt.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Portability.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/ProfileMgmt.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/SWAT.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Samba-Developers-Guide.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/Samba-HOWTO-Collection.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/SambaHA.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/ServerType.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/StandAloneServer.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/VFS.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/bugreport.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/compiling.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/diagnosis.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/domain-member.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/editreg.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/findsmb.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/groupmapping.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/index.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/install.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/integrate-ms-networks.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/ix01.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/lmhosts.5.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/locking.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/log2pcap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/migration.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/mount.cifs.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/msdfs.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/net.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/nmbd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/nmblookup.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/ntlm_auth.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/optional.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/pam.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/passdb.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/pdbedit.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/pr01.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/pr02.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/printing.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/problems.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/profiles.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/rpcclient.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/samba-bdc.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/samba-pdc.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/samba.7.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/samba.css
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/securing-samba.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smb.conf.5.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbcacls.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbclient.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbcontrol.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbcquotas.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbget.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbmnt.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbmount.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbpasswd.5.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbpasswd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbsh.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbspool.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbstatus.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbtar.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbtree.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/smbumount.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/speed.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/swat.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/tdbbackup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/tdbdump.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/testparm.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/testprns.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/troubleshooting.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/type.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/unicode.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/upgrading-to-3.0.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/vfstest.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/wbinfo.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/winbind.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/winbindd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/10small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/11small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/12small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/13small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/14small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/1small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/2small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/3small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/4small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/5small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/6small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/7small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/8small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/9small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/a_small.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/access1.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/browsing1.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/cups1.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/cups2.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/domain.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/ethereal1.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/ethereal2.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-gid2sid.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-groups.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-sid2gid.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-sid2uid.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-store-gid2sid.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap-uid2sid.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/idmap_winbind_no_loop.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/pdftoepsonusb.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/pdftosocket.png
+%%PORTDOCS%%%%DOCSDIR%%/htmldocs/images/trusts1.png
+%%PORTDOCS%%%%DOCSDIR%%/Registry/FolderRedir.adm
+%%PORTDOCS%%%%DOCSDIR%%/Registry/NT4-Locking.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/NT4_PlainPassword.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/Win-2Kx-XPP-DeleteCachedProfiles.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/Win-2Kx-XPP-ForceLocalProfile.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/Win-NT-DeleteRoamingProfile.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/Win2000_PlainPassword.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/Win95_PlainPassword.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/Win98_PlainPassword.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/Win9X-CacheHandling.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/WinME_PlainPassword.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/WinXP_PlainPassword.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/WinXP_SignOrSeal.reg
+%%PORTDOCS%%%%DOCSDIR%%/Registry/WindowsTerminalServer.reg
+%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/README
+%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/kdc-pdc
+%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-mature
+%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-migration
+%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-sync
+%%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/.cvsignore
+%%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/oldtdbutil.py
+%%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/tdbtimetrial.py
+%%PYTHON%%%%EXAMPLESDIR%%/python/tdbpack/test_tdbpack.py
+%%PYTHON%%%%EXAMPLESDIR%%/python/spoolss/changeid.py
+%%PYTHON%%%%EXAMPLESDIR%%/python/spoolss/enumprinters.py
+%%PYTHON%%%%EXAMPLESDIR%%/python/spoolss/psec.py
+%%EXAMPLESDIR%%/pdb/Makefile
+%%EXAMPLESDIR%%/pdb/README
+%%EXAMPLESDIR%%/pdb/mysql/mysql.dump
+%%EXAMPLESDIR%%/pdb/mysql/smb.conf
+%%EXAMPLESDIR%%/pdb/pdb_test.c
+%%EXAMPLESDIR%%/pdb/sambapdb.dtd
+%%EXAMPLESDIR%%/validchars/msdos70.out
+%%EXAMPLESDIR%%/validchars/nwdos70.out
+%%EXAMPLESDIR%%/validchars/readme
+%%EXAMPLESDIR%%/validchars/validchr.c
+%%EXAMPLESDIR%%/validchars/validchr.com
+%%EXAMPLESDIR%%/tridge/README
+%%EXAMPLESDIR%%/tridge/smb.conf
+%%EXAMPLESDIR%%/tridge/smb.conf.WinNT
+%%EXAMPLESDIR%%/tridge/smb.conf.fjall
+%%EXAMPLESDIR%%/tridge/smb.conf.lapland
+%%EXAMPLESDIR%%/tridge/smb.conf.vittjokk
+%%EXAMPLESDIR%%/thoralf/smb.conf
+%%EXAMPLESDIR%%/svr4-startup/samba.server
+%%EXAMPLESDIR%%/svr4-startup/README
+%%EXAMPLESDIR%%/LDAP/README
+%%EXAMPLESDIR%%/LDAP/convertSambaAccount
+%%EXAMPLESDIR%%/LDAP/ldapsync.pl
+%%EXAMPLESDIR%%/LDAP/samba-nds.schema
+%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds4.x
+%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x
+%%EXAMPLESDIR%%/LDAP/samba-schema.IBMSecureWay
+%%EXAMPLESDIR%%/LDAP/samba.schema
+%%EXAMPLESDIR%%/LDAP/samba.schema.at.IBM-DS
+%%EXAMPLESDIR%%/LDAP/samba.schema.oc.IBM-DS
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/CONTRIBUTORS
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/COPYING
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/ChangeLog
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/FILES
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/INFRASTRUCTURE
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/INSTALL
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/Makefile
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/README
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/TODO
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi/README
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi/ldappass.cgi
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/Makefile
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/getopt.c
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/getopt.h
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/md4.c
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/mkntpwd.c
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/mkntpwd.h
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd/smbdes.c
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupadd.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupdel.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupmod.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-groupshow.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-migrate-accounts.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-migrate-groups.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-passwd.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-populate.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-tools.spec
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-useradd.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-userdel.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-usermod.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap-usershow.pl
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_conf.pm
+%%EXAMPLESDIR%%/LDAP/smbldap-tools/smbldap_tools.pm
+%%EXAMPLESDIR%%/simple/README
+%%EXAMPLESDIR%%/simple/smb.conf
+%%EXAMPLESDIR%%/printing/prtpub.c
+%%EXAMPLESDIR%%/printing/readme.prtpub
+%%EXAMPLESDIR%%/printing/smbprint
+%%EXAMPLESDIR%%/printing/smbprint-new.sh
+%%EXAMPLESDIR%%/printing/smbprint.sysv
+%%EXAMPLESDIR%%/printer-accounting/README
+%%EXAMPLESDIR%%/printer-accounting/acct-all
+%%EXAMPLESDIR%%/printer-accounting/acct-sum
+%%EXAMPLESDIR%%/printer-accounting/hp5-redir
+%%EXAMPLESDIR%%/printer-accounting/lp-acct
+%%EXAMPLESDIR%%/printer-accounting/printcap
+%%EXAMPLESDIR%%/VFS/Makefile.in
+%%EXAMPLESDIR%%/VFS/README
+%%EXAMPLESDIR%%/VFS/autogen.sh
+%%EXAMPLESDIR%%/VFS/configure.in
+%%EXAMPLESDIR%%/VFS/install-sh
+%%EXAMPLESDIR%%/VFS/shadow_copy_test.c
+%%EXAMPLESDIR%%/VFS/skel_opaque.c
+%%EXAMPLESDIR%%/VFS/skel_transparent.c
+%%EXAMPLESDIR%%/ntlogon/README
+%%EXAMPLESDIR%%/ntlogon/ntlogon.conf
+%%EXAMPLESDIR%%/ntlogon/ntlogon.py
+%%EXAMPLESDIR%%/wins_hook/README
+%%EXAMPLESDIR%%/wins_hook/dns_update
+%%EXAMPLESDIR%%/misc/extra_smbstatus
+%%EXAMPLESDIR%%/misc/modify_samba_config.pl
+%%EXAMPLESDIR%%/misc/swat.pl
+%%EXAMPLESDIR%%/misc/wall.perl
+%%EXAMPLESDIR%%/libsmbclient/Makefile
+%%EXAMPLESDIR%%/libsmbclient/README
+%%EXAMPLESDIR%%/libsmbclient/testacl.c
+%%EXAMPLESDIR%%/libsmbclient/testbrowse.c
+%%EXAMPLESDIR%%/libsmbclient/testsmbc.c
+%%EXAMPLESDIR%%/libsmbclient/tree.c
+%%EXAMPLESDIR%%/genlogon/genlogon.pl
+%%EXAMPLESDIR%%/dce-dfs/README
+%%EXAMPLESDIR%%/dce-dfs/smb.conf
+%%EXAMPLESDIR%%/autofs/auto.a
+%%EXAMPLESDIR%%/auth/Makefile
+%%EXAMPLESDIR%%/auth/auth_skel.c
+%%EXAMPLESDIR%%/appliance/Makefile
+%%EXAMPLESDIR%%/appliance/README
+%%EXAMPLESDIR%%/appliance/appliance.spec
+%%EXAMPLESDIR%%/appliance/build.sh
+%%EXAMPLESDIR%%/appliance/smb.conf-appliance
+%%EXAMPLESDIR%%/nss/nss_winbind.c
+%%EXAMPLESDIR%%/nss/nss_winbind.h
+%%EXAMPLESDIR%%/nss/wbtest.c
+%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/smb.conf.default
 share/swat/help/AccessControls.html
 share/swat/help/AdvancedNetworkManagement.html
 share/swat/help/Appendixes.html
@@ -453,6 +454,39 @@ share/swat/images/shares.gif
 share/swat/images/status.gif
 share/swat/images/viewconfig.gif
 share/swat/images/wizard.gif
+share/swat/help/images/10small.png
+share/swat/help/images/11small.png
+share/swat/help/images/12small.png
+share/swat/help/images/13small.png
+share/swat/help/images/14small.png
+share/swat/help/images/1small.png
+share/swat/help/images/2small.png
+share/swat/help/images/3small.png
+share/swat/help/images/4small.png
+share/swat/help/images/5small.png
+share/swat/help/images/6small.png
+share/swat/help/images/7small.png
+share/swat/help/images/8small.png
+share/swat/help/images/9small.png
+share/swat/help/images/a_small.png
+share/swat/help/images/access1.png
+share/swat/help/images/browsing1.png
+share/swat/help/images/cups1.png
+share/swat/help/images/cups2.png
+share/swat/help/images/domain.png
+share/swat/help/images/ethereal1.png
+share/swat/help/images/ethereal2.png
+share/swat/help/images/idmap-gid2sid.png
+share/swat/help/images/idmap-groups.png
+share/swat/help/images/idmap-sid2gid.png
+share/swat/help/images/idmap-sid2uid.png
+share/swat/help/images/idmap-store-gid2sid.png
+share/swat/help/images/idmap-uid2sid.png
+share/swat/help/images/idmap.png
+share/swat/help/images/idmap_winbind_no_loop.png
+share/swat/help/images/pdftoepsonusb.png
+share/swat/help/images/pdftosocket.png
+share/swat/help/images/trusts1.png
 share/swat/include/footer.html
 share/swat/include/header.html
 share/swat/lang/ja/help/welcome.html
@@ -646,37 +680,38 @@ share/swat/using_samba/samba2_xs.gif
 @dirrm share/swat/lang
 @dirrm share/swat/include
 @dirrm share/swat/images
+@dirrm share/swat/help/images
 @dirrm share/swat/help
 @dirrm share/swat
-%%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/ntlogon
-@dirrm share/examples/samba/nss
-@dirrm share/examples/samba/misc
-@dirrm share/examples/samba/libsmbclient
-@dirrm share/examples/samba/genlogon
-@dirrm share/examples/samba/dce-dfs
-@dirrm share/examples/samba/autofs
-@dirrm share/examples/samba/auth
-@dirrm share/examples/samba/appliance
-@dirrm share/examples/samba/VFS
-@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
+%%SMBPASS%%@dirrm %%EXAMPLESDIR%%/pam_smbpass
+%%PYTHON%%@dirrm %%EXAMPLESDIR%%/python/spoolss
+%%PYTHON%%@dirrm %%EXAMPLESDIR%%/python/tdbpack
+%%PYTHON%%@dirrm %%EXAMPLESDIR%%/python
+@dirrm %%EXAMPLESDIR%%/wins_hook
+@dirrm %%EXAMPLESDIR%%/validchars
+@dirrm %%EXAMPLESDIR%%/tridge
+@dirrm %%EXAMPLESDIR%%/thoralf
+@dirrm %%EXAMPLESDIR%%/svr4-startup
+@dirrm %%EXAMPLESDIR%%/simple
+@dirrm %%EXAMPLESDIR%%/printing
+@dirrm %%EXAMPLESDIR%%/printer-accounting
+@dirrm %%EXAMPLESDIR%%/pdb/mysql
+@dirrm %%EXAMPLESDIR%%/pdb
+@dirrm %%EXAMPLESDIR%%/ntlogon
+@dirrm %%EXAMPLESDIR%%/nss
+@dirrm %%EXAMPLESDIR%%/misc
+@dirrm %%EXAMPLESDIR%%/libsmbclient
+@dirrm %%EXAMPLESDIR%%/genlogon
+@dirrm %%EXAMPLESDIR%%/dce-dfs
+@dirrm %%EXAMPLESDIR%%/autofs
+@dirrm %%EXAMPLESDIR%%/auth
+@dirrm %%EXAMPLESDIR%%/appliance
+@dirrm %%EXAMPLESDIR%%/VFS
+@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd
+@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/cgi
+@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools
+@dirrm %%EXAMPLESDIR%%/LDAP
+@dirrm %%EXAMPLESDIR%%
 @dirrm lib/samba/vfs
 @dirrm lib/samba/rpc
 @dirrm lib/samba/pdb
@@ -684,14 +719,14 @@ share/swat/using_samba/samba2_xs.gif
 @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
+%%PYTHON%%@unexec rmdir -p %D/lib/%%PYTHON_VERSION%%/site-packages/samba 2>/dev/null || true
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Registry
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/htmldocs/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/htmldocs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %%SAMBA_SPOOL%% || true
-@exec chmod 1777 %%SAMBA_SPOOL%%
+@exec chmod 0755 %%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