Add samba-devel --> ports/net/samba-devel, repocopied from ports/net/samba.

This port represents unstable, development Samba branch.

PR:		24808
Submitted by:	David W. Chapman Jr. <dwcjr@inethouston.net>

21 files changed, 419 insertions, 720 deletions

diff --git a/net/Makefile b/net/Makefile
index 03d062f7f517..0ba9abd1961f 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -251,6 +251,7 @@
     SUBDIR += ruby-uri
     SUBDIR += rwhois
     SUBDIR += samba
+    SUBDIR += samba-devel
     SUBDIR += scotty
     SUBDIR += scotty3
     SUBDIR += sdl_net
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index d2d4aebe501e..2af62ed0a03e 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.0.7
+PORTVERSION=	2.2.0a2
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.samba.org/pub/samba/ \
-		ftp://ring.asahi-net.or.jp/pub/net/samba/ \
-		ftp://samba.anu.edu.au/pub/samba/ \
-		ftp://de.samba.org/pub/mirror/samba/ \
-		ftp://se.samba.org/pub/samba/ \
-		ftp://ftp.sunet.se/pub/unix/utilities/samba/
+MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
+		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
+		ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
+		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
+		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
+MASTER_SITE_SUBDIR= alpha
+DISTNAME=       samba-2.2.0-alpha2
 
-MAINTAINER=	hosokawa@jp.FreeBSD.org
+MAINTAINER=	dwcjr@inethouston.net
 
 # directories
 VARDIR=		/var
@@ -31,7 +32,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	 --libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
-		--with-lockdir=${VARDIR}/spool/lock --with-privatedir=${SAMBA_PRIVATE}
+		--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE}
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
@@ -39,13 +40,14 @@ CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		nmblookup.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
-		testparm.1 testprns.1 make_smbcodepage.1 smbsh.1 \
-		make_unicodemap.1
-MAN5=		smb.conf.5 smbpasswd.5 lmhosts.5
+MAN1=		findsmb.1 make_smbcodepage.1 make_unicodemap.1 \
+		nmblookup.1 smbclient.1 smbcontrol.1 smbrun.1 \
+		smbsh.1 smbstatus.1 smbtar.1 testparm.1 \
+		testprns.1 wbinfo.1
+MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7
-MAN8=		smbd.8 nmbd.8 smbpasswd.8 swat.8 smbspool.8 \
-		smbmount.8 smbumount.8 smbmnt.8
+MAN8=		nmbd.8 rpcclient.8 smbd.8 smbmnt.8 smbpasswd.8 \
+		smbspool.8 smbumount.8 swat.8 winbindd.8
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/samba
@@ -80,10 +82,9 @@ post-install:
 	${ECHO} "private/smbpasswd" >> ${TMPPLIST}
 	${ECHO} "@dirrm private" >> ${TMPPLIST}
 .else
-	${ECHO} "@unexec echo \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
+	${ECHO} "@unexec ${ECHO} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
 .endif
 
-
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/samba
 	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
diff --git a/net/samba-devel/distinfo b/net/samba-devel/distinfo
index 37cb33745240..2baac47653f3 100644
--- a/net/samba-devel/distinfo
+++ b/net/samba-devel/distinfo
@@ -1 +1 @@
-MD5 (samba-2.0.7.tar.gz) = b5e61ea655d476072fd0365785fea2d0
+MD5 (samba-2.2.0-alpha2.tar.gz) = d7b69f53b6e8354537d9151ecb4f16ea
diff --git a/net/samba-devel/files/patch-aa b/net/samba-devel/files/patch-aa
index 3633f55c7b8f..6ba160fb1b10 100644
--- a/net/samba-devel/files/patch-aa
+++ b/net/samba-devel/files/patch-aa
@@ -1,23 +1,23 @@
---- Makefile.in.orig	Wed Apr 26 02:06:11 2000
-+++ Makefile.in	Thu Apr 27 11:08:08 2000
-@@ -25,7 +25,7 @@
+--- Makefile.in.orig	Mon Jan 29 19:42:53 2001
++++ Makefile.in	Fri Feb  2 10:42:21 2001
+@@ -30,9 +30,9 @@
  BINDIR = @bindir@
  # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
 -SBINDIR = @bindir@
 +SBINDIR = @sbindir@
  LIBDIR = @libdir@
- VARDIR = @localstatedir@
+-VARDIR = @localstatedir@
++VARDIR = /var
  MANDIR = @mandir@
-@@ -37,12 +37,13 @@
+ 
+ # The permissions to give the executables
+@@ -41,11 +41,11 @@
  # set these to where to find various files
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+LOGDIR=$(VARDIR)/log
-+SMBLOGFILE = $(LOGDIR)/log.smb
-+NMBLOGFILE = $(LOGDIR)/log.nmb
+-LOGFILEBASE = $(VARDIR)
++LOGFILEBASE = $(VARDIR)/log
  CONFIGFILE = $(LIBDIR)/smb.conf
  LMHOSTSFILE = $(LIBDIR)/lmhosts
  DRIVERFILE = $(LIBDIR)/printers.def
@@ -26,7 +26,7 @@
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -54,6 +55,9 @@
+@@ -58,6 +58,9 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -36,12 +36,12 @@
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
  
-@@ -71,7 +75,7 @@
- PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
- FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
+@@ -75,7 +78,7 @@
+ PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
+ FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
  FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
 -FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
 +FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
+ FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DFORMSFILE=\"$(FORMSFILE)\" -DNTDRIVERSDIR=\"$(NTDRIVERSDIR)\"
  FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
  FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba-devel/files/patch-ab b/net/samba-devel/files/patch-ab
index 40158831ba75..7cc000262680 100644
--- a/net/samba-devel/files/patch-ab
+++ b/net/samba-devel/files/patch-ab
@@ -1,35 +1,35 @@
---- param/loadparm.c.orig	Wed Apr 26 02:07:00 2000
-+++ param/loadparm.c	Thu Apr 27 11:12:03 2000
-@@ -105,6 +105,7 @@
- {
-   char *szPrintcapname;
-   char *szLockDir;
-+  char *szPidDir;
-   char *szRootdir;
-   char *szDefaultService;
-   char *szDfree;
-@@ -820,6 +821,8 @@
-   {"preload",          P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
-   {"lock directory",   P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
-   {"lock dir",         P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
-+  {"pidfile dir",      P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL,   NULL,  0},
-+  {"pidfile directory",P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL,   NULL,  0},
+--- param/loadparm.c.orig	Fri Feb  2 00:42:53 2001
++++ param/loadparm.c	Fri Feb  2 00:45:23 2001
+@@ -108,6 +108,7 @@
+ 	char *szAddPrinterCommand;
+ 	char *szDeletePrinterCommand;
+ 	char *szLockDir;
++	char *szPidDir;
+ 	char *szRootdir;
+ 	char *szDefaultService;
+ 	char *szDfree;
+@@ -948,6 +949,8 @@
+ 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
+ 	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, 
+ 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
++	{"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
++	{"pidfile directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
  #ifdef WITH_UTMP
-   {"utmp directory",   P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
-   {"utmp dir",         P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
-@@ -911,6 +914,7 @@
-   string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
-   string_set(&Globals.szDriverFile, DRIVERFILE);
-   string_set(&Globals.szLockDir, LOCKDIR);
-+  string_set(&Globals.szPidDir, PIDFILEDIR);
-   string_set(&Globals.szRootdir, "/");
+ 	{"utmp dir", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+ 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+@@ -1171,6 +1174,7 @@
+ 	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
+ 	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
+ 	string_set(&Globals.szLockDir, LOCKDIR);
++	string_set(&Globals.szPidDir, PIDFILEDIR);
  #ifdef WITH_UTMP
-   string_set(&Globals.szUtmpDir, "");
-@@ -1185,6 +1189,7 @@
- FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
- FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
- FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
-+FN_GLOBAL_STRING(lp_piddir,&Globals.szPidDir)
+ 	string_set(&Globals.szUtmpDir, "");
+ 	string_set(&Globals.szWtmpDir, "");
+@@ -1403,6 +1407,7 @@
+ FN_GLOBAL_STRING(lp_addprinter_cmd, &Globals.szAddPrinterCommand)
+ FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
+ FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
++FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
  #ifdef WITH_UTMP
- FN_GLOBAL_STRING(lp_utmpdir,&Globals.szUtmpDir)
- FN_GLOBAL_STRING(lp_wtmpdir,&Globals.szWtmpDir)
+ FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
+ FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)
diff --git a/net/samba-devel/files/patch-ac b/net/samba-devel/files/patch-ac
index dd53b8418c1e..0527cb5a32f8 100644
--- a/net/samba-devel/files/patch-ac
+++ b/net/samba-devel/files/patch-ac
@@ -1,6 +1,6 @@
---- lib/pidfile.c.orig	Fri Jan 15 22:40:47 1999
-+++ lib/pidfile.c	Fri Jan 15 22:41:05 1999
-@@ -37,7 +37,7 @@
+--- lib/pidfile.c.orig	Fri Feb  2 00:38:09 2001
++++ lib/pidfile.c	Fri Feb  2 00:38:26 2001
+@@ -39,7 +39,7 @@
  	unsigned ret;
  	pstring pidFile;
  
@@ -9,9 +9,9 @@
  
  	fd = sys_open(pidFile, O_NONBLOCK | O_RDWR, 0644);
  	if (fd == -1) {
-@@ -78,7 +78,7 @@
+@@ -80,7 +80,7 @@
  	pstring pidFile;
- 	int pid;
+ 	pid_t pid;
  
 -	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
 +	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
diff --git a/net/samba-devel/files/patch-ag b/net/samba-devel/files/patch-ag
deleted file mode 100644
index eac80026a659..000000000000
--- a/net/samba-devel/files/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
---- nmbd/nmbd_winsserver.c.orig	Wed Jul 21 10:25:11 1999
-+++ nmbd/nmbd_winsserver.c	Fri Jul 23 15:14:33 1999
-@@ -152,7 +152,7 @@
-   start_async_dns();
- #endif
- 
--  pstrcpy(fname,lp_lockdir());
-+  pstrcpy(fname,"/var/db");
-   trim_string(fname,NULL,"/");
-   pstrcat(fname,"/");
-   pstrcat(fname,WINS_LIST);
-@@ -1551,7 +1551,7 @@
- 	  }
-   }
- 
--  slprintf(fname,sizeof(fname),"%s/%s", lp_lockdir(), WINS_LIST);
-+  slprintf(fname,sizeof(fname),"%s/%s", "/var/db", WINS_LIST);
-   all_string_sub(fname,"//", "/", 0);
-   slprintf(fnamenew,sizeof(fnamenew),"%s.%u", fname, (unsigned int)getpid());
- 
diff --git a/net/samba-devel/files/patch-ah b/net/samba-devel/files/patch-ah
index 81b1f75158a4..e97b12388c05 100644
--- a/net/samba-devel/files/patch-ah
+++ b/net/samba-devel/files/patch-ah
@@ -1,5 +1,5 @@
---- lib/util_sock.c.orig	Wed Sep 22 10:52:50 1999
-+++ lib/util_sock.c	Wed Sep 22 11:30:18 1999
+--- lib/util_sock.c.orig	Fri Feb  2 12:09:17 2001
++++ lib/util_sock.c	Fri Feb  2 12:09:36 2001
 @@ -28,6 +28,9 @@
  extern int  sslFd;
  #endif  /* WITH_SSL */
@@ -9,4 +9,4 @@
 +
  extern int DEBUGLEVEL;
  
- BOOL passive = False;
+ /* the last IP received from */
diff --git a/net/samba-devel/files/patch-aj b/net/samba-devel/files/patch-aj
index 5e31ad8ebaa7..ad93c26811da 100644
--- a/net/samba-devel/files/patch-aj
+++ b/net/samba-devel/files/patch-aj
@@ -1,6 +1,6 @@
 --- include/local.h.orig	Thu Nov 11 03:36:00 1999
 +++ include/local.h	Fri Feb  4 11:33:01 2000
-@@ -178,9 +178,9 @@
+@@ -171,9 +171,9 @@
   * Default passwd chat script.
   */
  
diff --git a/net/samba-devel/files/patch-bb b/net/samba-devel/files/patch-bb
new file mode 100644
index 000000000000..0f70c69c78f4
--- /dev/null
+++ b/net/samba-devel/files/patch-bb
@@ -0,0 +1,10 @@
+--- include/proto.h.orig	Fri Feb  2 15:34:50 2001
++++ include/proto.h	Fri Feb  2 16:13:03 2001
+@@ -1420,6 +1420,7 @@
+ char *lp_addprinter_cmd(void);
+ char *lp_deleteprinter_cmd(void);
+ char *lp_lockdir(void);
++char *lp_piddir(void);
+ char *lp_utmpdir(void);
+ char *lp_wtmpdir(void);
+ char *lp_utmp_hostname(void);
diff --git a/net/samba-devel/pkg-plist b/net/samba-devel/pkg-plist
index 56feadef0d63..b6551bd95384 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -1,114 +1,71 @@
 bin/smbclient
+bin/smbspool
+bin/testparm
+bin/testprns
 bin/smbstatus
+bin/smbcontrol
 bin/smbpasswd
+bin/make_smbcodepage
+bin/make_unicodemap
+bin/rpcclient
 bin/nmblookup
+bin/make_printerdef
 bin/smbtar
 bin/addtosmbpass
 bin/convert_smbpasswd
-bin/testparm
-bin/testprns
 bin/make_smbpasswd
-bin/make_smbcodepage
-bin/make_unicodemap
-bin/make_printerdef
-bin/rpcclient
-bin/smbspool
-sbin/smbd
-sbin/nmbd
-sbin/swat
-share/examples/samba/README
-share/examples/samba/smb.conf.default
-share/examples/samba/autofs/README
-share/examples/samba/autofs/auto.a
-share/examples/samba/dce-dfs/README
-share/examples/samba/dce-dfs/smb.conf
-share/examples/samba/misc/extra_smbstatus
-share/examples/samba/misc/wall.perl
-share/examples/samba/printer-accounting/README
-share/examples/samba/printer-accounting/acct-all
-share/examples/samba/printer-accounting/acct-sum
-share/examples/samba/printer-accounting/hp5-redir
-share/examples/samba/printer-accounting/lp-acct
-share/examples/samba/printer-accounting/printcap
-share/examples/samba/printing/smbprint
-share/examples/samba/printing/smbprint.sysv
-share/examples/samba/simple/README
-share/examples/samba/simple/smb.conf
-share/examples/samba/svr4-startup/README
-share/examples/samba/svr4-startup/samba.server
-share/examples/samba/thoralf/smb.conf
-share/examples/samba/tridge/README
-share/examples/samba/tridge/smb.conf
-share/examples/samba/tridge/smb.conf.WinNT
-share/examples/samba/tridge/smb.conf.fjall
-share/examples/samba/tridge/smb.conf.lapland
-share/examples/samba/tridge/smb.conf.vittjokk
-share/examples/samba/validchars/msdos70.out
-share/examples/samba/validchars/nwdos70.out
-share/examples/samba/validchars/readme
-share/examples/samba/validchars/validchr.c
-share/examples/samba/validchars/validchr.com
-share/examples/samba/wins_hook/README
-share/examples/samba/wins_hook/dns_update
-@dirrm share/examples/samba/autofs
-@dirrm share/examples/samba/dce-dfs
-@dirrm share/examples/samba/misc
-@dirrm share/examples/samba/printing
-@dirrm share/examples/samba/printer-accounting
-@dirrm share/examples/samba/simple
-@dirrm share/examples/samba/svr4-startup
-@dirrm share/examples/samba/thoralf
-@dirrm share/examples/samba/tridge
-@dirrm share/examples/samba/validchars
-@dirrm share/examples/samba/wins_hook
-@dirrm share/examples/samba
 etc/rc.d/samba.sh.sample
-etc/smb.conf.default
 etc/codepages/codepage.437
+etc/codepages/unicode_map.437
 etc/codepages/codepage.737
+etc/codepages/unicode_map.737
 etc/codepages/codepage.775
 etc/codepages/codepage.850
-etc/codepages/codepage.852
-etc/codepages/codepage.861
-etc/codepages/codepage.866
-etc/codepages/codepage.932
-etc/codepages/codepage.936
-etc/codepages/codepage.949
-etc/codepages/codepage.950
-etc/codepages/codepage.1251
-etc/codepages/unicode_map.437
-etc/codepages/unicode_map.737
 etc/codepages/unicode_map.850
+etc/codepages/codepage.852
 etc/codepages/unicode_map.852
+etc/codepages/codepage.861
 etc/codepages/unicode_map.861
-etc/codepages/unicode_map.866
+etc/codepages/codepage.932
 etc/codepages/unicode_map.932
-etc/codepages/unicode_map.936
+etc/codepages/codepage.866
+etc/codepages/unicode_map.866
+etc/codepages/codepage.949
 etc/codepages/unicode_map.949
+etc/codepages/codepage.950
 etc/codepages/unicode_map.950
+etc/codepages/codepage.936
+etc/codepages/unicode_map.936
+etc/codepages/codepage.1251
 etc/codepages/unicode_map.ISO8859-1
 etc/codepages/unicode_map.ISO8859-2
 etc/codepages/unicode_map.ISO8859-5
 etc/codepages/unicode_map.ISO8859-7
-etc/codepages/unicode_map.KOI8-R
-@dirrm etc/codepages
+etc/codepages/codepage.857
+etc/codepages/unicode_map.857
+etc/codepages/unicode_map.ISO8859-9
+etc/smb.conf.default
+sbin/smbd
+sbin/nmbd
+sbin/swat
+share/doc/samba/README.FreeBSD
+share/doc/samba/README
 share/doc/samba/COPYING
 share/doc/samba/Manifest
-share/doc/samba/NT4_PlainPassword.reg
-share/doc/samba/NT4-Locking.reg
-share/doc/samba/README
-share/doc/samba/README.FreeBSD
-share/doc/samba/README.swat
 share/doc/samba/Read-Manifest-Now
 share/doc/samba/Roadmap
-share/doc/samba/THANKS
 share/doc/samba/WHATSNEW.txt
+share/doc/samba/NT4-Locking.reg
+share/doc/samba/NT4_PlainPassword.reg
 share/doc/samba/Win2000_PlainPassword.reg
 share/doc/samba/Win95_PlainPassword.reg
 share/doc/samba/Win98_PlainPassword.reg
 share/doc/samba/Win9X-CacheHandling.reg
+share/doc/samba/WinME_PlainPassword.reg
 share/doc/samba/WindowsTerminalServer.reg
+share/doc/samba/THANKS
 share/doc/samba/announce
+share/doc/samba/history
 share/doc/samba/faq/Samba-Server-FAQ-1.html
 share/doc/samba/faq/Samba-Server-FAQ-2.html
 share/doc/samba/faq/Samba-Server-FAQ.html
@@ -130,38 +87,38 @@ share/doc/samba/faq/sambafaq-5.html
 share/doc/samba/faq/sambafaq.html
 share/doc/samba/faq/sambafaq.sgml
 share/doc/samba/faq/sambafaq.txt
-share/doc/samba/history
 share/doc/samba/htmldocs/DOMAIN_MEMBER.html
 share/doc/samba/htmldocs/NT_Security.html
+share/doc/samba/htmldocs/findsmb.1.html
 share/doc/samba/htmldocs/lmhosts.5.html
 share/doc/samba/htmldocs/make_smbcodepage.1.html
-share/doc/samba/htmldocs/make_unicodemap.1.html
 share/doc/samba/htmldocs/nmbd.8.html
 share/doc/samba/htmldocs/nmblookup.1.html
+share/doc/samba/htmldocs/rpcclient.8.html
+share/doc/samba/htmldocs/samba-pdc-faq.html
+share/doc/samba/htmldocs/samba-pdc-howto.html
 share/doc/samba/htmldocs/samba.7.html
 share/doc/samba/htmldocs/smb.conf.5.html
 share/doc/samba/htmldocs/smbclient.1.html
+share/doc/samba/htmldocs/smbcontrol.1.html
 share/doc/samba/htmldocs/smbd.8.html
-share/doc/samba/htmldocs/smbmnt.8.html
-share/doc/samba/htmldocs/smbmount.8.html
 share/doc/samba/htmldocs/smbpasswd.5.html
 share/doc/samba/htmldocs/smbpasswd.8.html
-share/doc/samba/htmldocs/smbspool.8.html
 share/doc/samba/htmldocs/smbrun.1.html
 share/doc/samba/htmldocs/smbsh.1.html
+share/doc/samba/htmldocs/smbspool.8.html
 share/doc/samba/htmldocs/smbstatus.1.html
 share/doc/samba/htmldocs/smbtar.1.html
 share/doc/samba/htmldocs/swat.8.html
 share/doc/samba/htmldocs/testparm.1.html
 share/doc/samba/htmldocs/testprns.1.html
+share/doc/samba/htmldocs/wbinfo.1.html
 share/doc/samba/htmldocs/wfw_slip.htm
-share/doc/samba/textdocs/smbmount.txt
-share/doc/samba/textdocs/NT-Guest-Access.txt
+share/doc/samba/htmldocs/winbindd.8.html
 share/doc/samba/textdocs/Application_Serving.txt
 share/doc/samba/textdocs/BROWSING-Config.txt
 share/doc/samba/textdocs/BROWSING.txt
 share/doc/samba/textdocs/BUGS.txt
-share/doc/samba/textdocs/CRLF-LF-Conversions.txt
 share/doc/samba/textdocs/CVS_ACCESS.txt
 share/doc/samba/textdocs/DHCP-Server-Configuration.txt
 share/doc/samba/textdocs/DIAGNOSIS.txt
@@ -171,10 +128,10 @@ share/doc/samba/textdocs/DOMAIN_CONTROL.txt
 share/doc/samba/textdocs/DOMAIN_MEMBER.txt
 share/doc/samba/textdocs/ENCRYPTION.txt
 share/doc/samba/textdocs/Faxing.txt
-share/doc/samba/textdocs/File-Cacheing.txt
 share/doc/samba/textdocs/GOTCHAS.txt
 share/doc/samba/textdocs/HINTS.txt
 share/doc/samba/textdocs/INSTALL.sambatar
+share/doc/samba/textdocs/Imprints.txt
 share/doc/samba/textdocs/MIRRORS.txt
 share/doc/samba/textdocs/Macintosh_Clients.txt
 share/doc/samba/textdocs/NTDOMAIN.txt
@@ -182,6 +139,7 @@ share/doc/samba/textdocs/NT_Security.txt
 share/doc/samba/textdocs/NetBIOS.txt
 share/doc/samba/textdocs/OS2-Client-HOWTO.txt
 share/doc/samba/textdocs/PRINTER_DRIVER.txt
+share/doc/samba/textdocs/PRINTER_DRIVER2.txt
 share/doc/samba/textdocs/PROFILES.txt
 share/doc/samba/textdocs/PROJECTS
 share/doc/samba/textdocs/Passwords.txt
@@ -204,49 +162,96 @@ share/doc/samba/textdocs/UNIX_SECURITY.txt
 share/doc/samba/textdocs/Win95.txt
 share/doc/samba/textdocs/WinNT.txt
 share/doc/samba/textdocs/cifsntdomain.txt
+share/doc/samba/textdocs/kurs.pdf
+share/doc/samba/textdocs/kurs.tex
+share/doc/samba/textdocs/logo.ps
+share/doc/samba/textdocs/samba-pdc-faq.txt
+share/doc/samba/textdocs/samba-pdc-howto.txt
 share/doc/samba/textdocs/security_level.txt
 share/doc/samba/yodldocs/DOMAIN_MEMBER.yo
 share/doc/samba/yodldocs/NT_Security.yo
+share/doc/samba/yodldocs/findsmb.1.yo
 share/doc/samba/yodldocs/lmhosts.5.yo
 share/doc/samba/yodldocs/make_smbcodepage.1.yo
-share/doc/samba/yodldocs/make_unicodemap.1.yo
 share/doc/samba/yodldocs/nmbd.8.yo
 share/doc/samba/yodldocs/nmblookup.1.yo
+share/doc/samba/yodldocs/rpcclient.8.yo
 share/doc/samba/yodldocs/samba.7.yo
 share/doc/samba/yodldocs/smb.conf.5.yo
 share/doc/samba/yodldocs/smbclient.1.yo
+share/doc/samba/yodldocs/smbcontrol.1.yo
 share/doc/samba/yodldocs/smbd.8.yo
-share/doc/samba/yodldocs/smbmnt.8.yo
-share/doc/samba/yodldocs/smbmount.8.yo
 share/doc/samba/yodldocs/smbpasswd.5.yo
 share/doc/samba/yodldocs/smbpasswd.8.yo
-share/doc/samba/yodldocs/smbspool.8.yo
 share/doc/samba/yodldocs/smbrun.1.yo
 share/doc/samba/yodldocs/smbsh.1.yo
+share/doc/samba/yodldocs/smbspool.8.yo
 share/doc/samba/yodldocs/smbstatus.1.yo
 share/doc/samba/yodldocs/smbtar.1.yo
 share/doc/samba/yodldocs/swat.8.yo
 share/doc/samba/yodldocs/testparm.1.yo
 share/doc/samba/yodldocs/testprns.1.yo
-@dirrm share/doc/samba/faq
-@dirrm share/doc/samba/htmldocs
-@dirrm share/doc/samba/textdocs
-@dirrm share/doc/samba/yodldocs
-@dirrm share/doc/samba
+share/doc/samba/yodldocs/wbinfo.1.yo
+share/doc/samba/yodldocs/winbindd.8.yo
+share/doc/samba/README.swat
+share/examples/samba/simple/README
+share/examples/samba/simple/smb.conf
+share/examples/samba/tridge/smb.conf.WinNT
+share/examples/samba/tridge/smb.conf.vittjokk
+share/examples/samba/tridge/smb.conf.fjall
+share/examples/samba/tridge/README
+share/examples/samba/tridge/smb.conf.lapland
+share/examples/samba/tridge/smb.conf
+share/examples/samba/thoralf/smb.conf
+share/examples/samba/svr4-startup/README
+share/examples/samba/svr4-startup/samba.server
+share/examples/samba/VFS/.cvsignore
+share/examples/samba/VFS/audit.c
+share/examples/samba/VFS/README
+share/examples/samba/VFS/Makefile
+share/examples/samba/VFS/skel.c
+share/examples/samba/appliance/appliance.spec
+share/examples/samba/appliance/README
+share/examples/samba/appliance/smb.conf-appliance
+share/examples/samba/appliance/Makefile
+share/examples/samba/appliance/build.sh
+share/examples/samba/printing/smbprint
+share/examples/samba/printing/smbprint.sysv
+share/examples/samba/validchars/validchr.com
+share/examples/samba/validchars/readme
+share/examples/samba/validchars/validchr.c
+share/examples/samba/validchars/msdos70.out
+share/examples/samba/validchars/nwdos70.out
+share/examples/samba/misc/swat.pl
+share/examples/samba/misc/extra_smbstatus
+share/examples/samba/misc/wall.perl
+share/examples/samba/dce-dfs/README
+share/examples/samba/dce-dfs/smb.conf
+share/examples/samba/autofs/auto.a
+share/examples/samba/printer-accounting/hp5-redir
+share/examples/samba/printer-accounting/acct-all
+share/examples/samba/printer-accounting/acct-sum
+share/examples/samba/printer-accounting/README
+share/examples/samba/printer-accounting/lp-acct
+share/examples/samba/printer-accounting/printcap
+share/examples/samba/smb.conf.default
+share/examples/samba/README
 share/swat/help/welcome.html
 share/swat/help/DOMAIN_MEMBER.html
 share/swat/help/NT_Security.html
+share/swat/help/findsmb.1.html
 share/swat/help/lmhosts.5.html
 share/swat/help/make_smbcodepage.1.html
-share/swat/help/make_unicodemap.1.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
+share/swat/help/rpcclient.8.html
+share/swat/help/samba-pdc-faq.html
+share/swat/help/samba-pdc-howto.html
 share/swat/help/samba.7.html
 share/swat/help/smb.conf.5.html
 share/swat/help/smbclient.1.html
+share/swat/help/smbcontrol.1.html
 share/swat/help/smbd.8.html
-share/swat/help/smbmnt.8.html
-share/swat/help/smbmount.8.html
 share/swat/help/smbpasswd.5.html
 share/swat/help/smbpasswd.8.html
 share/swat/help/smbrun.1.html
@@ -257,7 +262,8 @@ share/swat/help/smbtar.1.html
 share/swat/help/swat.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
-share/swat/help/welcome.ja_JP.ujis.html
+share/swat/help/wbinfo.1.html
+share/swat/help/winbindd.8.html
 share/swat/images/globals.gif
 share/swat/images/home.gif
 share/swat/images/passwd.gif
@@ -268,173 +274,25 @@ share/swat/images/status.gif
 share/swat/images/viewconfig.gif
 share/swat/include/footer.html
 share/swat/include/header.html
-share/swat/using_samba/appa_01.html
-share/swat/using_samba/appa_02.html
-share/swat/using_samba/appa_03.html
-share/swat/using_samba/appa_04.html
-share/swat/using_samba/appa_05.html
-share/swat/using_samba/appb_01.html
-share/swat/using_samba/appb_02.html
-share/swat/using_samba/appb_03.html
-share/swat/using_samba/appc_01.html
-share/swat/using_samba/appd_01.html
-share/swat/using_samba/appe_01.html
-share/swat/using_samba/appf_01.html
-share/swat/using_samba/ch01_01.html
-share/swat/using_samba/ch01_02.html
-share/swat/using_samba/ch01_03.html
-share/swat/using_samba/ch01_04.html
-share/swat/using_samba/ch01_05.html
-share/swat/using_samba/ch01_06.html
-share/swat/using_samba/ch01_07.html
-share/swat/using_samba/ch01_08.html
-share/swat/using_samba/ch02_01.html
-share/swat/using_samba/ch02_02.html
-share/swat/using_samba/ch02_03.html
-share/swat/using_samba/ch02_04.html
-share/swat/using_samba/ch02_05.html
-share/swat/using_samba/ch02_06.html
-share/swat/using_samba/ch03_01.html
-share/swat/using_samba/ch03_02.html
-share/swat/using_samba/ch03_03.html
-share/swat/using_samba/ch04_01.html
-share/swat/using_samba/ch04_02.html
-share/swat/using_samba/ch04_03.html
-share/swat/using_samba/ch04_04.html
-share/swat/using_samba/ch04_05.html
-share/swat/using_samba/ch04_06.html
-share/swat/using_samba/ch04_07.html
-share/swat/using_samba/ch04_08.html
-share/swat/using_samba/ch05_01.html
-share/swat/using_samba/ch05_02.html
-share/swat/using_samba/ch05_03.html
-share/swat/using_samba/ch05_04.html
-share/swat/using_samba/ch05_05.html
-share/swat/using_samba/ch06_01.html
-share/swat/using_samba/ch06_02.html
-share/swat/using_samba/ch06_03.html
-share/swat/using_samba/ch06_04.html
-share/swat/using_samba/ch06_05.html
-share/swat/using_samba/ch06_06.html
-share/swat/using_samba/ch07_01.html
-share/swat/using_samba/ch07_02.html
-share/swat/using_samba/ch07_03.html
-share/swat/using_samba/ch08_01.html
-share/swat/using_samba/ch08_02.html
-share/swat/using_samba/ch08_03.html
-share/swat/using_samba/ch08_04.html
-share/swat/using_samba/ch08_05.html
-share/swat/using_samba/ch08_06.html
-share/swat/using_samba/ch08_07.html
-share/swat/using_samba/ch09_01.html
-share/swat/using_samba/ch09_02.html
-share/swat/using_samba/ch09_03.html
-share/swat/using_samba/index.html
-share/swat/using_samba/inx.html
-share/swat/using_samba/licenseinfo.html
-share/swat/using_samba/this_edition.html
-share/swat/using_samba/figs/sam.0101.gif
-share/swat/using_samba/figs/sam.0102.gif
-share/swat/using_samba/figs/sam.0103.gif
-share/swat/using_samba/figs/sam.0104.gif
-share/swat/using_samba/figs/sam.0105.gif
-share/swat/using_samba/figs/sam.0106.gif
-share/swat/using_samba/figs/sam.0107.gif
-share/swat/using_samba/figs/sam.0108.gif
-share/swat/using_samba/figs/sam.0109.gif
-share/swat/using_samba/figs/sam.0110.gif
-share/swat/using_samba/figs/sam.0111.gif
-share/swat/using_samba/figs/sam.0112.gif
-share/swat/using_samba/figs/sam.0113.gif
-share/swat/using_samba/figs/sam.0114.gif
-share/swat/using_samba/figs/sam.0201.gif
-share/swat/using_samba/figs/sam.0202.gif
-share/swat/using_samba/figs/sam.0203.gif
-share/swat/using_samba/figs/sam.0204.gif
-share/swat/using_samba/figs/sam.0301.gif
-share/swat/using_samba/figs/sam.0302.gif
-share/swat/using_samba/figs/sam.0303.gif
-share/swat/using_samba/figs/sam.0304.gif
-share/swat/using_samba/figs/sam.0305.gif
-share/swat/using_samba/figs/sam.0306.gif
-share/swat/using_samba/figs/sam.0307.gif
-share/swat/using_samba/figs/sam.0308.gif
-share/swat/using_samba/figs/sam.0309.gif
-share/swat/using_samba/figs/sam.0310.gif
-share/swat/using_samba/figs/sam.0311.gif
-share/swat/using_samba/figs/sam.0312.gif
-share/swat/using_samba/figs/sam.0313.gif
-share/swat/using_samba/figs/sam.0314.gif
-share/swat/using_samba/figs/sam.0315.gif
-share/swat/using_samba/figs/sam.0316.gif
-share/swat/using_samba/figs/sam.0317.gif
-share/swat/using_samba/figs/sam.0318.gif
-share/swat/using_samba/figs/sam.0319.gif
-share/swat/using_samba/figs/sam.0320.gif
-share/swat/using_samba/figs/sam.0321.gif
-share/swat/using_samba/figs/sam.0322.gif
-share/swat/using_samba/figs/sam.0323.gif
-share/swat/using_samba/figs/sam.0324.gif
-share/swat/using_samba/figs/sam.0325.gif
-share/swat/using_samba/figs/sam.0326.gif
-share/swat/using_samba/figs/sam.0327.gif
-share/swat/using_samba/figs/sam.0328.gif
-share/swat/using_samba/figs/sam.0401.gif
-share/swat/using_samba/figs/sam.0402.gif
-share/swat/using_samba/figs/sam.0403.gif
-share/swat/using_samba/figs/sam.0404.gif
-share/swat/using_samba/figs/sam.0405.gif
-share/swat/using_samba/figs/sam.0406.gif
-share/swat/using_samba/figs/sam.0407.gif
-share/swat/using_samba/figs/sam.0501.gif
-share/swat/using_samba/figs/sam.0502.gif
-share/swat/using_samba/figs/sam.0503.gif
-share/swat/using_samba/figs/sam.0504.gif
-share/swat/using_samba/figs/sam.0505.gif
-share/swat/using_samba/figs/sam.0506.gif
-share/swat/using_samba/figs/sam.0507.gif
-share/swat/using_samba/figs/sam.0508.gif
-share/swat/using_samba/figs/sam.0601.gif
-share/swat/using_samba/figs/sam.0602.gif
-share/swat/using_samba/figs/sam.0603.gif
-share/swat/using_samba/figs/sam.0604.gif
-share/swat/using_samba/figs/sam.0605.gif
-share/swat/using_samba/figs/sam.0606.gif
-share/swat/using_samba/figs/sam.0701.gif
-share/swat/using_samba/figs/sam.0702.gif
-share/swat/using_samba/figs/sam.0703.gif
-share/swat/using_samba/figs/sam.0704.gif
-share/swat/using_samba/figs/sam.0705.gif
-share/swat/using_samba/figs/sam.0706.gif
-share/swat/using_samba/figs/sam.0707.gif
-share/swat/using_samba/figs/sam.0708.gif
-share/swat/using_samba/figs/sam.0709.gif
-share/swat/using_samba/figs/sam.0801.gif
-share/swat/using_samba/figs/sam.0802.gif
-share/swat/using_samba/figs/sam.0803.gif
-share/swat/using_samba/figs/sam.0804.gif
-share/swat/using_samba/figs/sam.0805.gif
-share/swat/using_samba/figs/sam.0901.gif
-share/swat/using_samba/figs/sam.0902.gif
-share/swat/using_samba/figs/sam.0903.gif
-share/swat/using_samba/figs/sam.0904.gif
-share/swat/using_samba/figs/sam.0905.gif
-share/swat/using_samba/figs/sam.aa01.gif
-share/swat/using_samba/figs/sam.ab01.gif
-share/swat/using_samba/figs/sam.ab02.gif
-share/swat/using_samba/gifs/index.gif
-share/swat/using_samba/gifs/samba.s.gif
-share/swat/using_samba/gifs/txthome.gif
-share/swat/using_samba/gifs/txtnexta.gif
-share/swat/using_samba/gifs/txtpreva.gif
-@dirrm share/swat/help
+@dirrm share/doc/samba/faq
+@dirrm share/doc/samba/htmldocs
+@dirrm share/doc/samba/textdocs
+@dirrm share/doc/samba/yodldocs
+@dirrm share/doc/samba
+@dirrm share/examples/samba/simple
+@dirrm share/examples/samba/tridge
+@dirrm share/examples/samba/thoralf
+@dirrm share/examples/samba/svr4-startup
+@dirrm share/examples/samba/VFS
+@dirrm share/examples/samba/appliance
+@dirrm share/examples/samba/printing
+@dirrm share/examples/samba/validchars
+@dirrm share/examples/samba/misc
+@dirrm share/examples/samba/dce-dfs
+@dirrm share/examples/samba/autofs
+@dirrm share/examples/samba/printer-accounting
+@dirrm share/examples/samba
 @dirrm share/swat/images
 @dirrm share/swat/include
-@dirrm share/swat/using_samba/figs
-@dirrm share/swat/using_samba/gifs
-@dirrm share/swat/using_samba
+@dirrm share/swat/help
 @dirrm share/swat
-@exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ;  cat /etc/passwd | %D/bin/make_smbpasswd > %D/private/smbpasswd ; chmod 500 %D/private ; chmod 600 %D/private/smbpasswd ; fi
-@exec mkdir -p /var/spool/samba ; chmod 1777 /var/spool/samba
-@exec cat %D/share/doc/samba/README.FreeBSD
-@unexec rm -rf /var/spool/samba
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index d2d4aebe501e..2af62ed0a03e 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.0.7
+PORTVERSION=	2.2.0a2
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.samba.org/pub/samba/ \
-		ftp://ring.asahi-net.or.jp/pub/net/samba/ \
-		ftp://samba.anu.edu.au/pub/samba/ \
-		ftp://de.samba.org/pub/mirror/samba/ \
-		ftp://se.samba.org/pub/samba/ \
-		ftp://ftp.sunet.se/pub/unix/utilities/samba/
+MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
+		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
+		ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
+		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
+		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
+MASTER_SITE_SUBDIR= alpha
+DISTNAME=       samba-2.2.0-alpha2
 
-MAINTAINER=	hosokawa@jp.FreeBSD.org
+MAINTAINER=	dwcjr@inethouston.net
 
 # directories
 VARDIR=		/var
@@ -31,7 +32,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	 --libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
-		--with-lockdir=${VARDIR}/spool/lock --with-privatedir=${SAMBA_PRIVATE}
+		--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE}
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
@@ -39,13 +40,14 @@ CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAN1=		nmblookup.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
-		testparm.1 testprns.1 make_smbcodepage.1 smbsh.1 \
-		make_unicodemap.1
-MAN5=		smb.conf.5 smbpasswd.5 lmhosts.5
+MAN1=		findsmb.1 make_smbcodepage.1 make_unicodemap.1 \
+		nmblookup.1 smbclient.1 smbcontrol.1 smbrun.1 \
+		smbsh.1 smbstatus.1 smbtar.1 testparm.1 \
+		testprns.1 wbinfo.1
+MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
 MAN7=		samba.7
-MAN8=		smbd.8 nmbd.8 smbpasswd.8 swat.8 smbspool.8 \
-		smbmount.8 smbumount.8 smbmnt.8
+MAN8=		nmbd.8 rpcclient.8 smbd.8 smbmnt.8 smbpasswd.8 \
+		smbspool.8 smbumount.8 swat.8 winbindd.8
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/samba
@@ -80,10 +82,9 @@ post-install:
 	${ECHO} "private/smbpasswd" >> ${TMPPLIST}
 	${ECHO} "@dirrm private" >> ${TMPPLIST}
 .else
-	${ECHO} "@unexec echo \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
+	${ECHO} "@unexec ${ECHO} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
 .endif
 
-
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/samba
 	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 37cb33745240..2baac47653f3 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-2.0.7.tar.gz) = b5e61ea655d476072fd0365785fea2d0
+MD5 (samba-2.2.0-alpha2.tar.gz) = d7b69f53b6e8354537d9151ecb4f16ea
diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa
index 3633f55c7b8f..6ba160fb1b10 100644
--- a/net/samba3/files/patch-aa
+++ b/net/samba3/files/patch-aa
@@ -1,23 +1,23 @@
---- Makefile.in.orig	Wed Apr 26 02:06:11 2000
-+++ Makefile.in	Thu Apr 27 11:08:08 2000
-@@ -25,7 +25,7 @@
+--- Makefile.in.orig	Mon Jan 29 19:42:53 2001
++++ Makefile.in	Fri Feb  2 10:42:21 2001
+@@ -30,9 +30,9 @@
  BINDIR = @bindir@
  # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
 -SBINDIR = @bindir@
 +SBINDIR = @sbindir@
  LIBDIR = @libdir@
- VARDIR = @localstatedir@
+-VARDIR = @localstatedir@
++VARDIR = /var
  MANDIR = @mandir@
-@@ -37,12 +37,13 @@
+ 
+ # The permissions to give the executables
+@@ -41,11 +41,11 @@
  # set these to where to find various files
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+LOGDIR=$(VARDIR)/log
-+SMBLOGFILE = $(LOGDIR)/log.smb
-+NMBLOGFILE = $(LOGDIR)/log.nmb
+-LOGFILEBASE = $(VARDIR)
++LOGFILEBASE = $(VARDIR)/log
  CONFIGFILE = $(LIBDIR)/smb.conf
  LMHOSTSFILE = $(LIBDIR)/lmhosts
  DRIVERFILE = $(LIBDIR)/printers.def
@@ -26,7 +26,7 @@
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -54,6 +55,9 @@
+@@ -58,6 +58,9 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -36,12 +36,12 @@
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
  
-@@ -71,7 +75,7 @@
- PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
- FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
+@@ -75,7 +78,7 @@
+ PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
+ FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
  FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
 -FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
 +FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
+ FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DFORMSFILE=\"$(FORMSFILE)\" -DNTDRIVERSDIR=\"$(NTDRIVERSDIR)\"
  FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
  FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba3/files/patch-ab b/net/samba3/files/patch-ab
index 40158831ba75..7cc000262680 100644
--- a/net/samba3/files/patch-ab
+++ b/net/samba3/files/patch-ab
@@ -1,35 +1,35 @@
---- param/loadparm.c.orig	Wed Apr 26 02:07:00 2000
-+++ param/loadparm.c	Thu Apr 27 11:12:03 2000
-@@ -105,6 +105,7 @@
- {
-   char *szPrintcapname;
-   char *szLockDir;
-+  char *szPidDir;
-   char *szRootdir;
-   char *szDefaultService;
-   char *szDfree;
-@@ -820,6 +821,8 @@
-   {"preload",          P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
-   {"lock directory",   P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
-   {"lock dir",         P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
-+  {"pidfile dir",      P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL,   NULL,  0},
-+  {"pidfile directory",P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL,   NULL,  0},
+--- param/loadparm.c.orig	Fri Feb  2 00:42:53 2001
++++ param/loadparm.c	Fri Feb  2 00:45:23 2001
+@@ -108,6 +108,7 @@
+ 	char *szAddPrinterCommand;
+ 	char *szDeletePrinterCommand;
+ 	char *szLockDir;
++	char *szPidDir;
+ 	char *szRootdir;
+ 	char *szDefaultService;
+ 	char *szDfree;
+@@ -948,6 +949,8 @@
+ 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
+ 	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, 
+ 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
++	{"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
++	{"pidfile directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
  #ifdef WITH_UTMP
-   {"utmp directory",   P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
-   {"utmp dir",         P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
-@@ -911,6 +914,7 @@
-   string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
-   string_set(&Globals.szDriverFile, DRIVERFILE);
-   string_set(&Globals.szLockDir, LOCKDIR);
-+  string_set(&Globals.szPidDir, PIDFILEDIR);
-   string_set(&Globals.szRootdir, "/");
+ 	{"utmp dir", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+ 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+@@ -1171,6 +1174,7 @@
+ 	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
+ 	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
+ 	string_set(&Globals.szLockDir, LOCKDIR);
++	string_set(&Globals.szPidDir, PIDFILEDIR);
  #ifdef WITH_UTMP
-   string_set(&Globals.szUtmpDir, "");
-@@ -1185,6 +1189,7 @@
- FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
- FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
- FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
-+FN_GLOBAL_STRING(lp_piddir,&Globals.szPidDir)
+ 	string_set(&Globals.szUtmpDir, "");
+ 	string_set(&Globals.szWtmpDir, "");
+@@ -1403,6 +1407,7 @@
+ FN_GLOBAL_STRING(lp_addprinter_cmd, &Globals.szAddPrinterCommand)
+ FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
+ FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
++FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
  #ifdef WITH_UTMP
- FN_GLOBAL_STRING(lp_utmpdir,&Globals.szUtmpDir)
- FN_GLOBAL_STRING(lp_wtmpdir,&Globals.szWtmpDir)
+ FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
+ FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)
diff --git a/net/samba3/files/patch-ac b/net/samba3/files/patch-ac
index dd53b8418c1e..0527cb5a32f8 100644
--- a/net/samba3/files/patch-ac
+++ b/net/samba3/files/patch-ac
@@ -1,6 +1,6 @@
---- lib/pidfile.c.orig	Fri Jan 15 22:40:47 1999
-+++ lib/pidfile.c	Fri Jan 15 22:41:05 1999
-@@ -37,7 +37,7 @@
+--- lib/pidfile.c.orig	Fri Feb  2 00:38:09 2001
++++ lib/pidfile.c	Fri Feb  2 00:38:26 2001
+@@ -39,7 +39,7 @@
  	unsigned ret;
  	pstring pidFile;
  
@@ -9,9 +9,9 @@
  
  	fd = sys_open(pidFile, O_NONBLOCK | O_RDWR, 0644);
  	if (fd == -1) {
-@@ -78,7 +78,7 @@
+@@ -80,7 +80,7 @@
  	pstring pidFile;
- 	int pid;
+ 	pid_t pid;
  
 -	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
 +	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
diff --git a/net/samba3/files/patch-ag b/net/samba3/files/patch-ag
deleted file mode 100644
index eac80026a659..000000000000
--- a/net/samba3/files/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
---- nmbd/nmbd_winsserver.c.orig	Wed Jul 21 10:25:11 1999
-+++ nmbd/nmbd_winsserver.c	Fri Jul 23 15:14:33 1999
-@@ -152,7 +152,7 @@
-   start_async_dns();
- #endif
- 
--  pstrcpy(fname,lp_lockdir());
-+  pstrcpy(fname,"/var/db");
-   trim_string(fname,NULL,"/");
-   pstrcat(fname,"/");
-   pstrcat(fname,WINS_LIST);
-@@ -1551,7 +1551,7 @@
- 	  }
-   }
- 
--  slprintf(fname,sizeof(fname),"%s/%s", lp_lockdir(), WINS_LIST);
-+  slprintf(fname,sizeof(fname),"%s/%s", "/var/db", WINS_LIST);
-   all_string_sub(fname,"//", "/", 0);
-   slprintf(fnamenew,sizeof(fnamenew),"%s.%u", fname, (unsigned int)getpid());
- 
diff --git a/net/samba3/files/patch-ah b/net/samba3/files/patch-ah
index 81b1f75158a4..e97b12388c05 100644
--- a/net/samba3/files/patch-ah
+++ b/net/samba3/files/patch-ah
@@ -1,5 +1,5 @@
---- lib/util_sock.c.orig	Wed Sep 22 10:52:50 1999
-+++ lib/util_sock.c	Wed Sep 22 11:30:18 1999
+--- lib/util_sock.c.orig	Fri Feb  2 12:09:17 2001
++++ lib/util_sock.c	Fri Feb  2 12:09:36 2001
 @@ -28,6 +28,9 @@
  extern int  sslFd;
  #endif  /* WITH_SSL */
@@ -9,4 +9,4 @@
 +
  extern int DEBUGLEVEL;
  
- BOOL passive = False;
+ /* the last IP received from */
diff --git a/net/samba3/files/patch-aj b/net/samba3/files/patch-aj
index 5e31ad8ebaa7..ad93c26811da 100644
--- a/net/samba3/files/patch-aj
+++ b/net/samba3/files/patch-aj
@@ -1,6 +1,6 @@
 --- include/local.h.orig	Thu Nov 11 03:36:00 1999
 +++ include/local.h	Fri Feb  4 11:33:01 2000
-@@ -178,9 +178,9 @@
+@@ -171,9 +171,9 @@
   * Default passwd chat script.
   */
  
diff --git a/net/samba3/files/patch-bb b/net/samba3/files/patch-bb
new file mode 100644
index 000000000000..0f70c69c78f4
--- /dev/null
+++ b/net/samba3/files/patch-bb
@@ -0,0 +1,10 @@
+--- include/proto.h.orig	Fri Feb  2 15:34:50 2001
++++ include/proto.h	Fri Feb  2 16:13:03 2001
+@@ -1420,6 +1420,7 @@
+ char *lp_addprinter_cmd(void);
+ char *lp_deleteprinter_cmd(void);
+ char *lp_lockdir(void);
++char *lp_piddir(void);
+ char *lp_utmpdir(void);
+ char *lp_wtmpdir(void);
+ char *lp_utmp_hostname(void);
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 56feadef0d63..b6551bd95384 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -1,114 +1,71 @@
 bin/smbclient
+bin/smbspool
+bin/testparm
+bin/testprns
 bin/smbstatus
+bin/smbcontrol
 bin/smbpasswd
+bin/make_smbcodepage
+bin/make_unicodemap
+bin/rpcclient
 bin/nmblookup
+bin/make_printerdef
 bin/smbtar
 bin/addtosmbpass
 bin/convert_smbpasswd
-bin/testparm
-bin/testprns
 bin/make_smbpasswd
-bin/make_smbcodepage
-bin/make_unicodemap
-bin/make_printerdef
-bin/rpcclient
-bin/smbspool
-sbin/smbd
-sbin/nmbd
-sbin/swat
-share/examples/samba/README
-share/examples/samba/smb.conf.default
-share/examples/samba/autofs/README
-share/examples/samba/autofs/auto.a
-share/examples/samba/dce-dfs/README
-share/examples/samba/dce-dfs/smb.conf
-share/examples/samba/misc/extra_smbstatus
-share/examples/samba/misc/wall.perl
-share/examples/samba/printer-accounting/README
-share/examples/samba/printer-accounting/acct-all
-share/examples/samba/printer-accounting/acct-sum
-share/examples/samba/printer-accounting/hp5-redir
-share/examples/samba/printer-accounting/lp-acct
-share/examples/samba/printer-accounting/printcap
-share/examples/samba/printing/smbprint
-share/examples/samba/printing/smbprint.sysv
-share/examples/samba/simple/README
-share/examples/samba/simple/smb.conf
-share/examples/samba/svr4-startup/README
-share/examples/samba/svr4-startup/samba.server
-share/examples/samba/thoralf/smb.conf
-share/examples/samba/tridge/README
-share/examples/samba/tridge/smb.conf
-share/examples/samba/tridge/smb.conf.WinNT
-share/examples/samba/tridge/smb.conf.fjall
-share/examples/samba/tridge/smb.conf.lapland
-share/examples/samba/tridge/smb.conf.vittjokk
-share/examples/samba/validchars/msdos70.out
-share/examples/samba/validchars/nwdos70.out
-share/examples/samba/validchars/readme
-share/examples/samba/validchars/validchr.c
-share/examples/samba/validchars/validchr.com
-share/examples/samba/wins_hook/README
-share/examples/samba/wins_hook/dns_update
-@dirrm share/examples/samba/autofs
-@dirrm share/examples/samba/dce-dfs
-@dirrm share/examples/samba/misc
-@dirrm share/examples/samba/printing
-@dirrm share/examples/samba/printer-accounting
-@dirrm share/examples/samba/simple
-@dirrm share/examples/samba/svr4-startup
-@dirrm share/examples/samba/thoralf
-@dirrm share/examples/samba/tridge
-@dirrm share/examples/samba/validchars
-@dirrm share/examples/samba/wins_hook
-@dirrm share/examples/samba
 etc/rc.d/samba.sh.sample
-etc/smb.conf.default
 etc/codepages/codepage.437
+etc/codepages/unicode_map.437
 etc/codepages/codepage.737
+etc/codepages/unicode_map.737
 etc/codepages/codepage.775
 etc/codepages/codepage.850
-etc/codepages/codepage.852
-etc/codepages/codepage.861
-etc/codepages/codepage.866
-etc/codepages/codepage.932
-etc/codepages/codepage.936
-etc/codepages/codepage.949
-etc/codepages/codepage.950
-etc/codepages/codepage.1251
-etc/codepages/unicode_map.437
-etc/codepages/unicode_map.737
 etc/codepages/unicode_map.850
+etc/codepages/codepage.852
 etc/codepages/unicode_map.852
+etc/codepages/codepage.861
 etc/codepages/unicode_map.861
-etc/codepages/unicode_map.866
+etc/codepages/codepage.932
 etc/codepages/unicode_map.932
-etc/codepages/unicode_map.936
+etc/codepages/codepage.866
+etc/codepages/unicode_map.866
+etc/codepages/codepage.949
 etc/codepages/unicode_map.949
+etc/codepages/codepage.950
 etc/codepages/unicode_map.950
+etc/codepages/codepage.936
+etc/codepages/unicode_map.936
+etc/codepages/codepage.1251
 etc/codepages/unicode_map.ISO8859-1
 etc/codepages/unicode_map.ISO8859-2
 etc/codepages/unicode_map.ISO8859-5
 etc/codepages/unicode_map.ISO8859-7
-etc/codepages/unicode_map.KOI8-R
-@dirrm etc/codepages
+etc/codepages/codepage.857
+etc/codepages/unicode_map.857
+etc/codepages/unicode_map.ISO8859-9
+etc/smb.conf.default
+sbin/smbd
+sbin/nmbd
+sbin/swat
+share/doc/samba/README.FreeBSD
+share/doc/samba/README
 share/doc/samba/COPYING
 share/doc/samba/Manifest
-share/doc/samba/NT4_PlainPassword.reg
-share/doc/samba/NT4-Locking.reg
-share/doc/samba/README
-share/doc/samba/README.FreeBSD
-share/doc/samba/README.swat
 share/doc/samba/Read-Manifest-Now
 share/doc/samba/Roadmap
-share/doc/samba/THANKS
 share/doc/samba/WHATSNEW.txt
+share/doc/samba/NT4-Locking.reg
+share/doc/samba/NT4_PlainPassword.reg
 share/doc/samba/Win2000_PlainPassword.reg
 share/doc/samba/Win95_PlainPassword.reg
 share/doc/samba/Win98_PlainPassword.reg
 share/doc/samba/Win9X-CacheHandling.reg
+share/doc/samba/WinME_PlainPassword.reg
 share/doc/samba/WindowsTerminalServer.reg
+share/doc/samba/THANKS
 share/doc/samba/announce
+share/doc/samba/history
 share/doc/samba/faq/Samba-Server-FAQ-1.html
 share/doc/samba/faq/Samba-Server-FAQ-2.html
 share/doc/samba/faq/Samba-Server-FAQ.html
@@ -130,38 +87,38 @@ share/doc/samba/faq/sambafaq-5.html
 share/doc/samba/faq/sambafaq.html
 share/doc/samba/faq/sambafaq.sgml
 share/doc/samba/faq/sambafaq.txt
-share/doc/samba/history
 share/doc/samba/htmldocs/DOMAIN_MEMBER.html
 share/doc/samba/htmldocs/NT_Security.html
+share/doc/samba/htmldocs/findsmb.1.html
 share/doc/samba/htmldocs/lmhosts.5.html
 share/doc/samba/htmldocs/make_smbcodepage.1.html
-share/doc/samba/htmldocs/make_unicodemap.1.html
 share/doc/samba/htmldocs/nmbd.8.html
 share/doc/samba/htmldocs/nmblookup.1.html
+share/doc/samba/htmldocs/rpcclient.8.html
+share/doc/samba/htmldocs/samba-pdc-faq.html
+share/doc/samba/htmldocs/samba-pdc-howto.html
 share/doc/samba/htmldocs/samba.7.html
 share/doc/samba/htmldocs/smb.conf.5.html
 share/doc/samba/htmldocs/smbclient.1.html
+share/doc/samba/htmldocs/smbcontrol.1.html
 share/doc/samba/htmldocs/smbd.8.html
-share/doc/samba/htmldocs/smbmnt.8.html
-share/doc/samba/htmldocs/smbmount.8.html
 share/doc/samba/htmldocs/smbpasswd.5.html
 share/doc/samba/htmldocs/smbpasswd.8.html
-share/doc/samba/htmldocs/smbspool.8.html
 share/doc/samba/htmldocs/smbrun.1.html
 share/doc/samba/htmldocs/smbsh.1.html
+share/doc/samba/htmldocs/smbspool.8.html
 share/doc/samba/htmldocs/smbstatus.1.html
 share/doc/samba/htmldocs/smbtar.1.html
 share/doc/samba/htmldocs/swat.8.html
 share/doc/samba/htmldocs/testparm.1.html
 share/doc/samba/htmldocs/testprns.1.html
+share/doc/samba/htmldocs/wbinfo.1.html
 share/doc/samba/htmldocs/wfw_slip.htm
-share/doc/samba/textdocs/smbmount.txt
-share/doc/samba/textdocs/NT-Guest-Access.txt
+share/doc/samba/htmldocs/winbindd.8.html
 share/doc/samba/textdocs/Application_Serving.txt
 share/doc/samba/textdocs/BROWSING-Config.txt
 share/doc/samba/textdocs/BROWSING.txt
 share/doc/samba/textdocs/BUGS.txt
-share/doc/samba/textdocs/CRLF-LF-Conversions.txt
 share/doc/samba/textdocs/CVS_ACCESS.txt
 share/doc/samba/textdocs/DHCP-Server-Configuration.txt
 share/doc/samba/textdocs/DIAGNOSIS.txt
@@ -171,10 +128,10 @@ share/doc/samba/textdocs/DOMAIN_CONTROL.txt
 share/doc/samba/textdocs/DOMAIN_MEMBER.txt
 share/doc/samba/textdocs/ENCRYPTION.txt
 share/doc/samba/textdocs/Faxing.txt
-share/doc/samba/textdocs/File-Cacheing.txt
 share/doc/samba/textdocs/GOTCHAS.txt
 share/doc/samba/textdocs/HINTS.txt
 share/doc/samba/textdocs/INSTALL.sambatar
+share/doc/samba/textdocs/Imprints.txt
 share/doc/samba/textdocs/MIRRORS.txt
 share/doc/samba/textdocs/Macintosh_Clients.txt
 share/doc/samba/textdocs/NTDOMAIN.txt
@@ -182,6 +139,7 @@ share/doc/samba/textdocs/NT_Security.txt
 share/doc/samba/textdocs/NetBIOS.txt
 share/doc/samba/textdocs/OS2-Client-HOWTO.txt
 share/doc/samba/textdocs/PRINTER_DRIVER.txt
+share/doc/samba/textdocs/PRINTER_DRIVER2.txt
 share/doc/samba/textdocs/PROFILES.txt
 share/doc/samba/textdocs/PROJECTS
 share/doc/samba/textdocs/Passwords.txt
@@ -204,49 +162,96 @@ share/doc/samba/textdocs/UNIX_SECURITY.txt
 share/doc/samba/textdocs/Win95.txt
 share/doc/samba/textdocs/WinNT.txt
 share/doc/samba/textdocs/cifsntdomain.txt
+share/doc/samba/textdocs/kurs.pdf
+share/doc/samba/textdocs/kurs.tex
+share/doc/samba/textdocs/logo.ps
+share/doc/samba/textdocs/samba-pdc-faq.txt
+share/doc/samba/textdocs/samba-pdc-howto.txt
 share/doc/samba/textdocs/security_level.txt
 share/doc/samba/yodldocs/DOMAIN_MEMBER.yo
 share/doc/samba/yodldocs/NT_Security.yo
+share/doc/samba/yodldocs/findsmb.1.yo
 share/doc/samba/yodldocs/lmhosts.5.yo
 share/doc/samba/yodldocs/make_smbcodepage.1.yo
-share/doc/samba/yodldocs/make_unicodemap.1.yo
 share/doc/samba/yodldocs/nmbd.8.yo
 share/doc/samba/yodldocs/nmblookup.1.yo
+share/doc/samba/yodldocs/rpcclient.8.yo
 share/doc/samba/yodldocs/samba.7.yo
 share/doc/samba/yodldocs/smb.conf.5.yo
 share/doc/samba/yodldocs/smbclient.1.yo
+share/doc/samba/yodldocs/smbcontrol.1.yo
 share/doc/samba/yodldocs/smbd.8.yo
-share/doc/samba/yodldocs/smbmnt.8.yo
-share/doc/samba/yodldocs/smbmount.8.yo
 share/doc/samba/yodldocs/smbpasswd.5.yo
 share/doc/samba/yodldocs/smbpasswd.8.yo
-share/doc/samba/yodldocs/smbspool.8.yo
 share/doc/samba/yodldocs/smbrun.1.yo
 share/doc/samba/yodldocs/smbsh.1.yo
+share/doc/samba/yodldocs/smbspool.8.yo
 share/doc/samba/yodldocs/smbstatus.1.yo
 share/doc/samba/yodldocs/smbtar.1.yo
 share/doc/samba/yodldocs/swat.8.yo
 share/doc/samba/yodldocs/testparm.1.yo
 share/doc/samba/yodldocs/testprns.1.yo
-@dirrm share/doc/samba/faq
-@dirrm share/doc/samba/htmldocs
-@dirrm share/doc/samba/textdocs
-@dirrm share/doc/samba/yodldocs
-@dirrm share/doc/samba
+share/doc/samba/yodldocs/wbinfo.1.yo
+share/doc/samba/yodldocs/winbindd.8.yo
+share/doc/samba/README.swat
+share/examples/samba/simple/README
+share/examples/samba/simple/smb.conf
+share/examples/samba/tridge/smb.conf.WinNT
+share/examples/samba/tridge/smb.conf.vittjokk
+share/examples/samba/tridge/smb.conf.fjall
+share/examples/samba/tridge/README
+share/examples/samba/tridge/smb.conf.lapland
+share/examples/samba/tridge/smb.conf
+share/examples/samba/thoralf/smb.conf
+share/examples/samba/svr4-startup/README
+share/examples/samba/svr4-startup/samba.server
+share/examples/samba/VFS/.cvsignore
+share/examples/samba/VFS/audit.c
+share/examples/samba/VFS/README
+share/examples/samba/VFS/Makefile
+share/examples/samba/VFS/skel.c
+share/examples/samba/appliance/appliance.spec
+share/examples/samba/appliance/README
+share/examples/samba/appliance/smb.conf-appliance
+share/examples/samba/appliance/Makefile
+share/examples/samba/appliance/build.sh
+share/examples/samba/printing/smbprint
+share/examples/samba/printing/smbprint.sysv
+share/examples/samba/validchars/validchr.com
+share/examples/samba/validchars/readme
+share/examples/samba/validchars/validchr.c
+share/examples/samba/validchars/msdos70.out
+share/examples/samba/validchars/nwdos70.out
+share/examples/samba/misc/swat.pl
+share/examples/samba/misc/extra_smbstatus
+share/examples/samba/misc/wall.perl
+share/examples/samba/dce-dfs/README
+share/examples/samba/dce-dfs/smb.conf
+share/examples/samba/autofs/auto.a
+share/examples/samba/printer-accounting/hp5-redir
+share/examples/samba/printer-accounting/acct-all
+share/examples/samba/printer-accounting/acct-sum
+share/examples/samba/printer-accounting/README
+share/examples/samba/printer-accounting/lp-acct
+share/examples/samba/printer-accounting/printcap
+share/examples/samba/smb.conf.default
+share/examples/samba/README
 share/swat/help/welcome.html
 share/swat/help/DOMAIN_MEMBER.html
 share/swat/help/NT_Security.html
+share/swat/help/findsmb.1.html
 share/swat/help/lmhosts.5.html
 share/swat/help/make_smbcodepage.1.html
-share/swat/help/make_unicodemap.1.html
 share/swat/help/nmbd.8.html
 share/swat/help/nmblookup.1.html
+share/swat/help/rpcclient.8.html
+share/swat/help/samba-pdc-faq.html
+share/swat/help/samba-pdc-howto.html
 share/swat/help/samba.7.html
 share/swat/help/smb.conf.5.html
 share/swat/help/smbclient.1.html
+share/swat/help/smbcontrol.1.html
 share/swat/help/smbd.8.html
-share/swat/help/smbmnt.8.html
-share/swat/help/smbmount.8.html
 share/swat/help/smbpasswd.5.html
 share/swat/help/smbpasswd.8.html
 share/swat/help/smbrun.1.html
@@ -257,7 +262,8 @@ share/swat/help/smbtar.1.html
 share/swat/help/swat.8.html
 share/swat/help/testparm.1.html
 share/swat/help/testprns.1.html
-share/swat/help/welcome.ja_JP.ujis.html
+share/swat/help/wbinfo.1.html
+share/swat/help/winbindd.8.html
 share/swat/images/globals.gif
 share/swat/images/home.gif
 share/swat/images/passwd.gif
@@ -268,173 +274,25 @@ share/swat/images/status.gif
 share/swat/images/viewconfig.gif
 share/swat/include/footer.html
 share/swat/include/header.html
-share/swat/using_samba/appa_01.html
-share/swat/using_samba/appa_02.html
-share/swat/using_samba/appa_03.html
-share/swat/using_samba/appa_04.html
-share/swat/using_samba/appa_05.html
-share/swat/using_samba/appb_01.html
-share/swat/using_samba/appb_02.html
-share/swat/using_samba/appb_03.html
-share/swat/using_samba/appc_01.html
-share/swat/using_samba/appd_01.html
-share/swat/using_samba/appe_01.html
-share/swat/using_samba/appf_01.html
-share/swat/using_samba/ch01_01.html
-share/swat/using_samba/ch01_02.html
-share/swat/using_samba/ch01_03.html
-share/swat/using_samba/ch01_04.html
-share/swat/using_samba/ch01_05.html
-share/swat/using_samba/ch01_06.html
-share/swat/using_samba/ch01_07.html
-share/swat/using_samba/ch01_08.html
-share/swat/using_samba/ch02_01.html
-share/swat/using_samba/ch02_02.html
-share/swat/using_samba/ch02_03.html
-share/swat/using_samba/ch02_04.html
-share/swat/using_samba/ch02_05.html
-share/swat/using_samba/ch02_06.html
-share/swat/using_samba/ch03_01.html
-share/swat/using_samba/ch03_02.html
-share/swat/using_samba/ch03_03.html
-share/swat/using_samba/ch04_01.html
-share/swat/using_samba/ch04_02.html
-share/swat/using_samba/ch04_03.html
-share/swat/using_samba/ch04_04.html
-share/swat/using_samba/ch04_05.html
-share/swat/using_samba/ch04_06.html
-share/swat/using_samba/ch04_07.html
-share/swat/using_samba/ch04_08.html
-share/swat/using_samba/ch05_01.html
-share/swat/using_samba/ch05_02.html
-share/swat/using_samba/ch05_03.html
-share/swat/using_samba/ch05_04.html
-share/swat/using_samba/ch05_05.html
-share/swat/using_samba/ch06_01.html
-share/swat/using_samba/ch06_02.html
-share/swat/using_samba/ch06_03.html
-share/swat/using_samba/ch06_04.html
-share/swat/using_samba/ch06_05.html
-share/swat/using_samba/ch06_06.html
-share/swat/using_samba/ch07_01.html
-share/swat/using_samba/ch07_02.html
-share/swat/using_samba/ch07_03.html
-share/swat/using_samba/ch08_01.html
-share/swat/using_samba/ch08_02.html
-share/swat/using_samba/ch08_03.html
-share/swat/using_samba/ch08_04.html
-share/swat/using_samba/ch08_05.html
-share/swat/using_samba/ch08_06.html
-share/swat/using_samba/ch08_07.html
-share/swat/using_samba/ch09_01.html
-share/swat/using_samba/ch09_02.html
-share/swat/using_samba/ch09_03.html
-share/swat/using_samba/index.html
-share/swat/using_samba/inx.html
-share/swat/using_samba/licenseinfo.html
-share/swat/using_samba/this_edition.html
-share/swat/using_samba/figs/sam.0101.gif
-share/swat/using_samba/figs/sam.0102.gif
-share/swat/using_samba/figs/sam.0103.gif
-share/swat/using_samba/figs/sam.0104.gif
-share/swat/using_samba/figs/sam.0105.gif
-share/swat/using_samba/figs/sam.0106.gif
-share/swat/using_samba/figs/sam.0107.gif
-share/swat/using_samba/figs/sam.0108.gif
-share/swat/using_samba/figs/sam.0109.gif
-share/swat/using_samba/figs/sam.0110.gif
-share/swat/using_samba/figs/sam.0111.gif
-share/swat/using_samba/figs/sam.0112.gif
-share/swat/using_samba/figs/sam.0113.gif
-share/swat/using_samba/figs/sam.0114.gif
-share/swat/using_samba/figs/sam.0201.gif
-share/swat/using_samba/figs/sam.0202.gif
-share/swat/using_samba/figs/sam.0203.gif
-share/swat/using_samba/figs/sam.0204.gif
-share/swat/using_samba/figs/sam.0301.gif
-share/swat/using_samba/figs/sam.0302.gif
-share/swat/using_samba/figs/sam.0303.gif
-share/swat/using_samba/figs/sam.0304.gif
-share/swat/using_samba/figs/sam.0305.gif
-share/swat/using_samba/figs/sam.0306.gif
-share/swat/using_samba/figs/sam.0307.gif
-share/swat/using_samba/figs/sam.0308.gif
-share/swat/using_samba/figs/sam.0309.gif
-share/swat/using_samba/figs/sam.0310.gif
-share/swat/using_samba/figs/sam.0311.gif
-share/swat/using_samba/figs/sam.0312.gif
-share/swat/using_samba/figs/sam.0313.gif
-share/swat/using_samba/figs/sam.0314.gif
-share/swat/using_samba/figs/sam.0315.gif
-share/swat/using_samba/figs/sam.0316.gif
-share/swat/using_samba/figs/sam.0317.gif
-share/swat/using_samba/figs/sam.0318.gif
-share/swat/using_samba/figs/sam.0319.gif
-share/swat/using_samba/figs/sam.0320.gif
-share/swat/using_samba/figs/sam.0321.gif
-share/swat/using_samba/figs/sam.0322.gif
-share/swat/using_samba/figs/sam.0323.gif
-share/swat/using_samba/figs/sam.0324.gif
-share/swat/using_samba/figs/sam.0325.gif
-share/swat/using_samba/figs/sam.0326.gif
-share/swat/using_samba/figs/sam.0327.gif
-share/swat/using_samba/figs/sam.0328.gif
-share/swat/using_samba/figs/sam.0401.gif
-share/swat/using_samba/figs/sam.0402.gif
-share/swat/using_samba/figs/sam.0403.gif
-share/swat/using_samba/figs/sam.0404.gif
-share/swat/using_samba/figs/sam.0405.gif
-share/swat/using_samba/figs/sam.0406.gif
-share/swat/using_samba/figs/sam.0407.gif
-share/swat/using_samba/figs/sam.0501.gif
-share/swat/using_samba/figs/sam.0502.gif
-share/swat/using_samba/figs/sam.0503.gif
-share/swat/using_samba/figs/sam.0504.gif
-share/swat/using_samba/figs/sam.0505.gif
-share/swat/using_samba/figs/sam.0506.gif
-share/swat/using_samba/figs/sam.0507.gif
-share/swat/using_samba/figs/sam.0508.gif
-share/swat/using_samba/figs/sam.0601.gif
-share/swat/using_samba/figs/sam.0602.gif
-share/swat/using_samba/figs/sam.0603.gif
-share/swat/using_samba/figs/sam.0604.gif
-share/swat/using_samba/figs/sam.0605.gif
-share/swat/using_samba/figs/sam.0606.gif
-share/swat/using_samba/figs/sam.0701.gif
-share/swat/using_samba/figs/sam.0702.gif
-share/swat/using_samba/figs/sam.0703.gif
-share/swat/using_samba/figs/sam.0704.gif
-share/swat/using_samba/figs/sam.0705.gif
-share/swat/using_samba/figs/sam.0706.gif
-share/swat/using_samba/figs/sam.0707.gif
-share/swat/using_samba/figs/sam.0708.gif
-share/swat/using_samba/figs/sam.0709.gif
-share/swat/using_samba/figs/sam.0801.gif
-share/swat/using_samba/figs/sam.0802.gif
-share/swat/using_samba/figs/sam.0803.gif
-share/swat/using_samba/figs/sam.0804.gif
-share/swat/using_samba/figs/sam.0805.gif
-share/swat/using_samba/figs/sam.0901.gif
-share/swat/using_samba/figs/sam.0902.gif
-share/swat/using_samba/figs/sam.0903.gif
-share/swat/using_samba/figs/sam.0904.gif
-share/swat/using_samba/figs/sam.0905.gif
-share/swat/using_samba/figs/sam.aa01.gif
-share/swat/using_samba/figs/sam.ab01.gif
-share/swat/using_samba/figs/sam.ab02.gif
-share/swat/using_samba/gifs/index.gif
-share/swat/using_samba/gifs/samba.s.gif
-share/swat/using_samba/gifs/txthome.gif
-share/swat/using_samba/gifs/txtnexta.gif
-share/swat/using_samba/gifs/txtpreva.gif
-@dirrm share/swat/help
+@dirrm share/doc/samba/faq
+@dirrm share/doc/samba/htmldocs
+@dirrm share/doc/samba/textdocs
+@dirrm share/doc/samba/yodldocs
+@dirrm share/doc/samba
+@dirrm share/examples/samba/simple
+@dirrm share/examples/samba/tridge
+@dirrm share/examples/samba/thoralf
+@dirrm share/examples/samba/svr4-startup
+@dirrm share/examples/samba/VFS
+@dirrm share/examples/samba/appliance
+@dirrm share/examples/samba/printing
+@dirrm share/examples/samba/validchars
+@dirrm share/examples/samba/misc
+@dirrm share/examples/samba/dce-dfs
+@dirrm share/examples/samba/autofs
+@dirrm share/examples/samba/printer-accounting
+@dirrm share/examples/samba
 @dirrm share/swat/images
 @dirrm share/swat/include
-@dirrm share/swat/using_samba/figs
-@dirrm share/swat/using_samba/gifs
-@dirrm share/swat/using_samba
+@dirrm share/swat/help
 @dirrm share/swat
-@exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ;  cat /etc/passwd | %D/bin/make_smbpasswd > %D/private/smbpasswd ; chmod 500 %D/private ; chmod 600 %D/private/smbpasswd ; fi
-@exec mkdir -p /var/spool/samba ; chmod 1777 /var/spool/samba
-@exec cat %D/share/doc/samba/README.FreeBSD
-@unexec rm -rf /var/spool/samba