Version up (Samba-2.0.0)

Reviewed by:	Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
Submitted by:	Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>

8 files changed, 301 insertions, 252 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index dbe2e71fd4b6..979fd72839a6 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,59 +1,45 @@
 # New ports collection makefile for:	samba
-# Version required:			1.9.18
+# Version required:			2.0.0
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.27 1998/08/28 02:07:45 hosokawa Exp $
+# $Id: Makefile,v 1.28 1999/01/12 18:25:32 scrappy Exp $
 #
 
-DISTNAME=	samba-1.9.18p10
-PKGNAME=	samba-1.9.18.10
+DISTNAME=	samba-2.0.0
+#PKGNAME=	samba-2.0.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 
-MAINTAINER=	hosokawa@jp.FreeBSD.ORG
+MAINTAINER=	hosokawa@jp.FreeBSD.org
 
 Y2K=		http://us1.samba.org/samba/docs/sambay2k.html
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/source
-MAN1=		smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1 make_smbcodepage.1
-MAN5=		smb.conf.5
-MAN7=		samba.7
-MAN8=		smbd.8 nmbd.8 smbpasswd.8
-
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
-SAMPLE_CONFIG=	${PREFIX}/etc/smb.conf.default
-SAMBA_SPOOL=	/var/spool/samba
-XSAMBA_SPOOL=	\/var\/spool\/samba
-SAMBA_LOGDIR=	/var/log
-XSAMBA_LOGDIR=	\/var\/log
+# directories
+VARDIR=		/var
+SAMBA_SPOOL=	${VARDIR}/spool/samba
+SAMBA_LOGDIR=	${VARDIR}/log
 SAMBA_PRIVATE=	${PREFIX}/private
+SAMBA_CONFDIR=	${PREFIX}/etc
+# sample files
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
+SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --libdir=${SAMBA_CONFDIR} \
+		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat
+WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-SAMBA_DOCS=${WRKDIR}/${DISTNAME}/docs/INSTALL.sambatar \
-	${WRKDIR}/${DISTNAME}/docs/THANKS \
-	${WRKDIR}/${DISTNAME}/docs/history \
-	${WRKDIR}/${DISTNAME}/docs/announce \
-	${WRKDIR}/${DISTNAME}/docs/PROJECTS \
-	${WRKDIR}/${DISTNAME}/docs/SMBTAR.notes
+MAN1=		nmblookup.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
+		testparm.1 testprns.1 make_smbcodepage.1
+MAN5=		smb.conf.5 smbpasswd.5 lmhosts.5
+MAN7=		samba.7
+MAN8=		smbd.8 nmbd.8 smbpasswd.8 swat.8 \
+		smbmount.8 smbumount.8 smbmnt.8
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/samba
 	${CP} -rp ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/samba/faq
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
-	for i in ${SAMBA_DOCS} ${WRKDIR}/${DISTNAME}/docs/*.txt		\
-			${WRKDIR}/${DISTNAME}/docs/*.reg		\
-			${WRKDIR}/${DISTNAME}/docs/*.htm		\
-			${WRKDIR}/${DISTNAME}/*.txt			\
-			${WRKDIR}/${DISTNAME}/README			\
-			${WRKDIR}/${DISTNAME}/docs/README.* ; do	\
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;		\
-	done
-	for i in ${WRKDIR}/${DISTNAME}/docs/faq/* ; do			\
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba/faq ;	\
-	done
-.endif
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file." ;	\
 		${INSTALL_SCRIPT} ${FILESDIR}/samba.sh.sample 		\
@@ -61,23 +47,46 @@ post-install:
 	fi
 	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && chmod 1777 ${SAMBA_SPOOL}
 	@if [ ! -f ${SAMPLE_CONFIG} ]; then				\
-		${SED} -e 's/__SAMBA_SPOOL__/${XSAMBA_SPOOL}/'		\
-		    -e 's/__LOGDIR__/${XSAMBA_LOGDIR}/' 		\
+		${SED} -e 's!%%SAMBA_SPOOL%%!${SAMBA_SPOOL}!'		\
+			-e 's!%%SAMBA_LOGDIR%%!${SAMBA_LOGDIR}!'	\
+			-e 's!%%SAMBA_CONFDIR%%!${SAMBA_CONFDIR}!'	\
 			${FILESDIR}/smb.conf.default			\
 			> ${SAMPLE_CONFIG} ;				\
 	fi
-	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/mksmbpasswd.sh ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
 	if [ ! -d ${SAMBA_PRIVATE} ] ; then				\
 		${MKDIR} ${SAMBA_PRIVATE} ;				\
 		chown root.wheel ${SAMBA_PRIVATE} ;			\
 	fi
 	chmod 700 ${SAMBA_PRIVATE}
 	if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then			\
-		${CAT} /etc/passwd | ${PREFIX}/bin/mksmbpasswd.sh > ${SAMBA_PRIVATE}/smbpasswd ; \
+		${CAT} /etc/passwd | ${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(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/samba
+	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
+	for i in ${WRKDIR}/${DISTNAME}/README				\
+			${WRKDIR}/${DISTNAME}/COPYING			\
+			${WRKDIR}/${DISTNAME}/WHATSNEW.txt		\
+			${WRKDIR}/${DISTNAME}/Roadmap			\
+			${WRKDIR}/${DISTNAME}/Manifest			\
+			${WRKDIR}/${DISTNAME}/docs/*.reg		\
+			${WRKDIR}/${DISTNAME}/docs/THANKS		\
+			${WRKDIR}/${DISTNAME}/docs/announce		\
+			${WRKDIR}/${DISTNAME}/docs/history		\
+			${WRKDIR}/${DISTNAME}/docs/textdocs/* ; do	\
+		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;		\
+	done
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${PREFIX}/share/doc/samba/README.swat
+	${MKDIR} ${PREFIX}/share/doc/samba/faq
+	for i in ${WRKDIR}/${DISTNAME}/docs/faq/* ; do			\
+		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba/faq ;	\
+	done
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/samba/distinfo b/net/samba/distinfo
index fce0a575630a..c3e117c00a12 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.18p10.tar.gz) = 31535614d61ccefd9dd6881685201d24
+MD5 (samba-2.0.0.tar.gz) = fb4477a7967a2df752a2a94a493fbe51
diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa
index c99001099c0a..c83a3c146655 100644
--- a/net/samba/files/patch-aa
+++ b/net/samba/files/patch-aa
@@ -1,49 +1,46 @@
---- Makefile.orig	Thu Jan  8 03:29:04 1998
-+++ Makefile	Thu Jan  8 14:52:32 1998
-@@ -5,11 +5,11 @@
- ###########################################################################
+--- Makefile.in.orig	Fri Jan 15 05:07:20 1999
++++ Makefile.in	Fri Jan 15 22:47:59 1999
+@@ -23,9 +23,7 @@
  
- # The base directory for all samba files
--BASEDIR = /usr/local/samba
-+BASEDIR = $(PREFIX)
- 
- # The base manpages directory to put the man pages in
- # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
--MANDIR = /usr/local/man
-+MANDIR = $(PREFIX)/man
- 
- # The directories to put things in. If you use multiple
- # architectures or share the samba binaries across NFS then
-@@ -18,9 +18,9 @@
- #       normally only applies to nmbd and smbd
- #       SBINDIR implies a secure binary directory
- BINDIR = $(BASEDIR)/bin
--SBINDIR = $(BASEDIR)/bin
--LIBDIR = $(BASEDIR)/lib
--VARDIR = $(BASEDIR)/var
-+SBINDIR = $(BASEDIR)/sbin
-+LIBDIR = $(BASEDIR)/etc
-+VARDIR = /var/log
- 
- # The permissions to give the executables
- INSTALLPERMS = 0755
-@@ -55,7 +55,7 @@
- WEB_ROOT = $(BASEDIR)
+ BASEDIR= @prefix@
+ 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@
+ MANDIR = @mandir@
+@@ -36,8 +34,9 @@
+ # 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
+ CONFIGFILE = $(LIBDIR)/smb.conf
+ LMHOSTSFILE = $(LIBDIR)/lmhosts
+ DRIVERFILE = $(LIBDIR)/printers.def
+@@ -52,7 +51,10 @@
+ SWATDIR = @swatdir@
  
  # the directory where lock files go
 -LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = /var/spool/lock
++LOCKDIR = $(VARDIR)/spool/lock
++
++# the directory where pid files go
++PIDFILEDIR = $(VARDIR)/run
  
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -396,8 +396,8 @@
- # This is for FreeBSD
- # contributed by kuku@acds.physik.rwth-aachen.de
- # NOTE: You may need to add -DBSD44 if you have password problems
--# FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
--# LIBSM = -lcrypt 
-+FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
-+LIBSM = -lcrypt 
- 
- # This is for OpenBSD
- # contributed by todd@openbsd.org
+@@ -71,7 +73,7 @@
+ PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DSMB_PASSWD_PROGRAM=\"$(SMB_PASSWD_PROGRAM)\"
+ FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
+ 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)\"
+ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
+ FLAGS  = $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba/files/patch-ab b/net/samba/files/patch-ab
new file mode 100644
index 000000000000..b3d798c9f601
--- /dev/null
+++ b/net/samba/files/patch-ab
@@ -0,0 +1,35 @@
+--- param/loadparm.c.orig	Fri Jan 15 22:35:00 1999
++++ param/loadparm.c	Fri Jan 15 22:33:18 1999
+@@ -104,6 +104,7 @@
+ {
+   char *szPrintcapname;
+   char *szLockDir;
++  char *szPidDir;
+   char *szRootdir;
+   char *szDefaultService;
+   char *szDfree;
+@@ -747,6 +748,8 @@
+   {"auto services",    P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
+   {"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},
+   {"default service",  P_STRING,  P_GLOBAL, &Globals.szDefaultService,  NULL,   NULL,  0},
+   {"default",          P_STRING,  P_GLOBAL, &Globals.szDefaultService,  NULL,   NULL,  0},
+   {"message command",  P_STRING,  P_GLOBAL, &Globals.szMsgCommand,      NULL,   NULL,  0},
+@@ -824,6 +827,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, "/");
+   string_set(&Globals.szSmbrun, SMBRUN);
+   string_set(&Globals.szSocketAddress, "0.0.0.0");
+@@ -1100,6 +1104,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)
+ FN_GLOBAL_STRING(lp_rootdir,&Globals.szRootdir)
+ FN_GLOBAL_STRING(lp_defaultservice,&Globals.szDefaultService)
+ FN_GLOBAL_STRING(lp_msg_command,&Globals.szMsgCommand)
diff --git a/net/samba/files/patch-ac b/net/samba/files/patch-ac
new file mode 100644
index 000000000000..dd53b8418c1e
--- /dev/null
+++ b/net/samba/files/patch-ac
@@ -0,0 +1,20 @@
+--- 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 @@
+ 	unsigned ret;
+ 	pstring pidFile;
+ 
+-	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
++	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
+ 
+ 	fd = sys_open(pidFile, O_NONBLOCK | O_RDWR, 0644);
+ 	if (fd == -1) {
+@@ -78,7 +78,7 @@
+ 	pstring pidFile;
+ 	int pid;
+ 
+-	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
++	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
+ 
+ 	pid = pidfile_pid(name);
+ 	if (pid != 0) {
diff --git a/net/samba/files/samba.sh.sample b/net/samba/files/samba.sh.sample
index 50b8968ec6c5..e6807ad6d145 100644
--- a/net/samba/files/samba.sh.sample
+++ b/net/samba/files/samba.sh.sample
@@ -1,13 +1,22 @@
 #!/bin/sh
 smbspool=/var/spool/samba
+pidfiledir=/var/run
 smbd=/usr/local/sbin/smbd
 nmbd=/usr/local/sbin/nmbd
 
-if [ -f $smbd ]; then
-	if [ -d $smbspool ]; then
-		rm -f $smbspool/*
+# start
+if [ "x$1" = "x" -o "x$1" = "xstart" ]; then
+	if [ -f $smbd ]; then
+		if [ -d $smbspool ]; then
+			rm -f $smbspool/*
+		fi
+		echo -n ' Samba'
+		$smbd -D
+		$nmbd -D
 	fi
-	echo -n ' Samba'
-	$smbd -D
-	$nmbd -D
+
+# stop
+elif [ "x$1" = "xstop" ]; then
+	kill `cat $pidfiledir/smbd.pid`
+	kill `cat $pidfiledir/nmbd.pid`
 fi
diff --git a/net/samba/files/smb.conf.default b/net/samba/files/smb.conf.default
index 012bcf719e1b..1b9d4d1f7ef7 100644
--- a/net/samba/files/smb.conf.default
+++ b/net/samba/files/smb.conf.default
@@ -14,7 +14,7 @@
 #======================= Global Settings =====================================
 [global]
 
-# workgroup = NT-Domain-Name or Workgroup-Name
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
    workgroup = MYGROUP
 
 # server string is the equivalent of the NT Description field
@@ -50,7 +50,7 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   log file = __LOGDIR__/log.%m
+   log file = %%SAMBA_LOGDIR%%/log.%m
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
@@ -61,22 +61,15 @@
 # Use password server option only with security = server
 ;   password server = <NT-Server-Name>
 
-# Password Level allows matching of _n_ characters of the password for
-# all combinations of upper and lower case.
-;  password level = 8
-
 # You may wish to use password encryption. Please read
 # ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
 # Do not enable this option unless you have read those documents
 ;  encrypt passwords = yes
 
-# Unix users can map to different SMB User names
-;  username map = /etc/smbusers
-
 # Using the following line enables you to customise your configuration
 # on a per machine basis. The %m gets replaced with the netbios name
 # of the machine that is connecting
-;   include = /usr/local/samba/lib/smb.conf.%m
+;   include = %%SAMBA_CONFDIR%%/smb.conf.%m
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
@@ -87,13 +80,6 @@
 # here. See the man page for details.
 ;   interfaces = 192.168.12.2/24 192.168.13.2/24 
 
-# Configure remote browse list synchronisation here
-#  request announcement to, or browse list sync from:
-#	a specific host or from / to a whole subnet (see below)
-;   remote browse sync = 192.168.3.25 192.168.5.255
-# Cause this host to announce itself to local subnets here
-;   remote announce = 192.168.1.255 192.168.2.44
-
 # Browser Control Options:
 # set local master to no if you don't want Samba to become a master
 # browser on your network. Otherwise the normal election rules apply
@@ -150,62 +136,6 @@
 # this has been changed in version 1.9.18 to no.
    dns proxy = no 
 
-# Case Preservation can be handy - system default is _no_
-# NOTE: These can be set on a per share basis
-;  preserve case = no
-;  short preserve case = no
-# Default case is normally upper case for all DOS files
-;  default case = lower
-# Be very careful with case sensitivity - it can break things!
-;  case sensitive = no
-
-# Client codepage settings
-
-# for Greek users
-; client code page=737
-
-# for European users (Latin 1)
-; client code page=850
-
-# for European users (Latin 2)
-; client code page=852
-
-# for Icelandic users
-; client code page=861
-
-# for Cyrillic users
-; client code page=866
-
-# for Japanese Users
-; client code page=932
-; coding system=cap
-
-# for Simplified Chinese Users
-; client code page=936
-; coding system=cap
-
-# for Korean Users
-; client code page=949
-; coding system=cap
-
-# for Traditional Chinese Users
-; client code page=950
-; coding system=cap
-
-# Samba performance workaround:
-#  If you have performance problem, please test these parameters.
-# Simon Lindgren <simon@lindgren.no> 's example:
-;   getwd cache = Yes
-;   max xmit = 8192
-;   read raw = yes
-;   read prediction = yes
-;   read size = 8192
-;   socket options = IPTOS_LOWDELAY TCP_NODELAY
-# Jerry Bell <bell@reillyplating.com> 's example:
-;   socket options = IPTOS_LOWDELAY TCP_NODELAY SO_SNDBUF=16384 SO_RCVBUF=16384
-;   readsize = 16384
-;   read prediction = true
-
 #============================ Share Definitions ==============================
 [homes]
    comment = Home Directories
@@ -233,7 +163,7 @@
 # specifically define each individual printer
 [printers]
    comment = All Printers
-   path = __SAMBA_SPOOL__
+   path = %%SAMBA_SPOOL%%
    browseable = no
 # Set public = yes to allow user 'guest account' to print
    guest ok = no
diff --git a/net/samba/pkg-plist b/net/samba/pkg-plist
index 5a45c8111d38..0a9ca3f6c417 100644
--- a/net/samba/pkg-plist
+++ b/net/samba/pkg-plist
@@ -5,35 +5,85 @@ bin/smbpasswd
 bin/nmblookup
 bin/smbtar
 bin/addtosmbpass
+bin/convert_smbpasswd
 bin/testparm
 bin/testprns
-bin/mksmbpasswd.sh
+bin/make_smbpasswd
 bin/make_smbcodepage
 bin/make_printerdef
+bin/rpcclient
 sbin/smbd
 sbin/nmbd
-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
-share/doc/samba/faq/Samba-Server-FAQ.sgml
-share/doc/samba/faq/Samba-meta-FAQ-1.html
-share/doc/samba/faq/Samba-meta-FAQ-2.html
-share/doc/samba/faq/Samba-meta-FAQ-3.html
-share/doc/samba/faq/Samba-meta-FAQ-4.html
-share/doc/samba/faq/Samba-meta-FAQ-5.html
-share/doc/samba/faq/Samba-meta-FAQ-6.html
-share/doc/samba/faq/Samba-meta-FAQ.html
-share/doc/samba/faq/Samba-meta-FAQ.sgml
-share/doc/samba/faq/Samba-meta-FAQ.txt
-share/doc/samba/faq/sambafaq-1.html
-share/doc/samba/faq/sambafaq-2.html
-share/doc/samba/faq/sambafaq-3.html
-share/doc/samba/faq/sambafaq-4.html
-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
+sbin/swat
+share/examples/samba/README
+share/examples/samba/smb.conf.default
+share/examples/samba/autofs/auto.a
+share/examples/samba/autofs/mount-smb.doc
+share/examples/samba/autofs/mount.smb
+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
+@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
+etc/rc.d/samba.sh.sample
+etc/smb.conf.default
+etc/codepages/codepage.437
+etc/codepages/codepage.737
+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
+@dirrm etc/codepages
+share/doc/samba/COPYING
+share/doc/samba/Manifest
+share/doc/samba/README
+share/doc/samba/README.FreeBSD
+share/doc/samba/README.swat
+share/doc/samba/Roadmap
+share/doc/samba/WHATSNEW.txt
+share/doc/samba/announce
+share/doc/samba/history
+share/doc/samba/THANKS
 share/doc/samba/Application_Serving.txt
+share/doc/samba/BROWSING-Config.txt
 share/doc/samba/BROWSING.txt
 share/doc/samba/BUGS.txt
 share/doc/samba/CVS_ACCESS.txt
@@ -42,13 +92,14 @@ share/doc/samba/DIAGNOSIS.txt
 share/doc/samba/DNIX.txt
 share/doc/samba/DOMAIN.txt
 share/doc/samba/DOMAIN_CONTROL.txt
+share/doc/samba/DOMAIN_MEMBER.txt
 share/doc/samba/ENCRYPTION.txt
 share/doc/samba/Faxing.txt
 share/doc/samba/GOTCHAS.txt
 share/doc/samba/HINTS.txt
 share/doc/samba/INSTALL.sambatar
 share/doc/samba/MIRRORS.txt
-share/doc/samba/NT4_PlainPassword.reg
+share/doc/samba/Macintosh_Clients.txt
 share/doc/samba/NTDOMAIN.txt
 share/doc/samba/NetBIOS.txt
 share/doc/samba/OS2-Client-HOWTO.txt
@@ -57,86 +108,84 @@ share/doc/samba/PROFILES.txt
 share/doc/samba/PROJECTS
 share/doc/samba/Passwords.txt
 share/doc/samba/Printing.txt
-share/doc/samba/README
 share/doc/samba/README.DCEDFS
-share/doc/samba/README.FreeBSD
 share/doc/samba/README.jis
 share/doc/samba/README.sambatar
+share/doc/samba/Recent-FAQs.txt
+share/doc/samba/RoutedNetworks.txt
 share/doc/samba/SCO.txt
 share/doc/samba/SMBTAR.notes
+share/doc/samba/SSLeay.txt
 share/doc/samba/Speed.txt
 share/doc/samba/Speed2.txt
 share/doc/samba/Support.txt
 share/doc/samba/Tracing.txt
-share/doc/samba/THANKS
 share/doc/samba/UNIX-SMB.txt
-share/doc/samba/Win95.txt
-share/doc/samba/Win95_PlainPassword.reg
 share/doc/samba/UNIX_INSTALL.txt
-share/doc/samba/WHATSNEW.txt
+share/doc/samba/UNIX_SECURITY.txt
+share/doc/samba/Win95.txt
 share/doc/samba/WinNT.txt
-share/doc/samba/announce
 share/doc/samba/cifsntdomain.txt
-share/doc/samba/history
 share/doc/samba/security_level.txt
-share/doc/samba/wfw_slip.htm
-share/examples/samba/dce-dfs/README
-share/examples/samba/dce-dfs/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/misc/extra_smbstatus
-share/examples/samba/misc/wall.perl
-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/printing/smbprint
-share/examples/samba/printing/smbprint.sysv
-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/simple/README
-share/examples/samba/simple/smb.conf
-share/examples/samba/smb.conf.default
-share/examples/samba/README
-etc/rc.d/samba.sh.sample
-etc/smb.conf.default
-etc/codepages/codepage.437
-etc/codepages/codepage.737
-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
+share/doc/samba/NT4_PlainPassword.reg
+share/doc/samba/Win95_PlainPassword.reg
+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
+share/doc/samba/faq/Samba-Server-FAQ.sgml
+share/doc/samba/faq/Samba-meta-FAQ-1.html
+share/doc/samba/faq/Samba-meta-FAQ-2.html
+share/doc/samba/faq/Samba-meta-FAQ-3.html
+share/doc/samba/faq/Samba-meta-FAQ-4.html
+share/doc/samba/faq/Samba-meta-FAQ-5.html
+share/doc/samba/faq/Samba-meta-FAQ-6.html
+share/doc/samba/faq/Samba-meta-FAQ.html
+share/doc/samba/faq/Samba-meta-FAQ.sgml
+share/doc/samba/faq/Samba-meta-FAQ.txt
+share/doc/samba/faq/sambafaq-1.html
+share/doc/samba/faq/sambafaq-2.html
+share/doc/samba/faq/sambafaq-3.html
+share/doc/samba/faq/sambafaq-4.html
+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
+@dirrm share/doc/samba/faq
+@dirrm share/doc/samba
+share/swat/help/welcome.html
+share/swat/help/DOMAIN_MEMBER.html
+share/swat/help/lmhosts.5.html
+share/swat/help/make_smbcodepage.1.html
+share/swat/help/nmbd.8.html
+share/swat/help/nmblookup.1.html
+share/swat/help/samba.7.html
+share/swat/help/smb.conf.5.html
+share/swat/help/smbclient.1.html
+share/swat/help/smbd.8.html
+share/swat/help/smbpasswd.5.html
+share/swat/help/smbpasswd.8.html
+share/swat/help/smbrun.1.html
+share/swat/help/smbstatus.1.html
+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/images/globals.gif
+share/swat/images/home.gif
+share/swat/images/passwd.gif
+share/swat/images/printers.gif
+share/swat/images/samba.gif
+share/swat/images/shares.gif
+share/swat/images/status.gif
+share/swat/images/viewconfig.gif
+share/swat/include/footer.html
+share/swat/include/header.html
+@dirrm share/swat/help
+@dirrm share/swat/images
+@dirrm share/swat/include
+@dirrm share/swat
 @exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ;  cat /etc/passwd | %D/bin/mksmbpasswd.sh > %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 echo "Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually."
 @unexec rm -rf /var/spool/samba
-@dirrm share/doc/samba/faq
-@dirrm share/doc/samba
-@dirrm share/examples/samba/dce-dfs
-@dirrm share/examples/samba/tridge
-@dirrm share/examples/samba/thoralf
-@dirrm share/examples/samba/svr4-startup
-@dirrm share/examples/samba/misc
-@dirrm share/examples/samba/validchars
-@dirrm share/examples/samba/printing
-@dirrm share/examples/samba/printer-accounting
-@dirrm share/examples/samba/simple
-@dirrm share/examples/samba
-@dirrm etc/codepages