9 files changed, 416 insertions, 65 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index c914a2098d61..774a208e5855 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,60 +1,80 @@
 # New ports collection makefile for:	samba
-# Version required:			1.9.17p4
+# Version required:			1.9.18
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.16 1997/10/23 14:38:55 max Exp $
+# $Id: Makefile,v 1.17 1997/10/23 15:03:20 max Exp $
 #
 
-DISTNAME=	samba-1.9.17p4
-PKGNAME=	samba-1.9.17.4
+DISTNAME=	samba-1.9.18
+PKGNAME=	samba-1.9.18.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 
 MAINTAINER=	hosokawa@jp.FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
-MAN1=		smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1
+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.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
+SAMBA_PRIVATE=	${PREFIX}/private
+
+SAMBA_DOCS=${WRKDIR}/${DISTNAME}/docs/INSTALL.sambatar \
+	${WRKDIR}/${DISTNAME}/docs/THANKS \
+	${WRKDIR}/${DISTNAME}/docs/history \
+	${WRKDIR}/${DISTNAME}/docs/announce \
+	${WRKDIR}/${DISTNAME}/docs/PROJECTS \
 
 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
-	for i in ${WRKDIR}/${DISTNAME}/docs/*.txt ${WRKDIR}/${DISTNAME}/docs/README* ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ; \
+	${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 ; \
+	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." ;	\
-		${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT} ;			\
-		${ECHO} 'smbd=${PREFIX}/sbin/smbd' >> ${STARTUP_SCRIPT} ;\
-		${ECHO} 'nmbd=${PREFIX}/sbin/nmbd' >> ${STARTUP_SCRIPT} ;\
-		${ECHO} 'if [ -f $$smbd ]; then' >> ${STARTUP_SCRIPT} ;	\
-		${ECHO} "	${ECHO} -n ' Samba'" >> ${STARTUP_SCRIPT} ;\
-		${ECHO} '	$$smbd -D' >> ${STARTUP_SCRIPT} ;	\
-		${ECHO} '	$$nmbd -D' >> ${STARTUP_SCRIPT} ;	\
-		${ECHO} "fi" >> ${STARTUP_SCRIPT} ;			\
-		chmod 755 ${STARTUP_SCRIPT} ;				\
-		chown bin.bin ${STARTUP_SCRIPT};			\
+		${INSTALL_SCRIPT} ${FILESDIR}/samba.sh.sample 		\
+			${STARTUP_SCRIPT} ;				\
 	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}/' 		\
-			${FILESDIR}/smb.conf.sample			\
+			${FILESDIR}/smb.conf.default			\
 			> ${SAMPLE_CONFIG} ;				\
 	fi
+	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/mksmbpasswd.sh ${PREFIX}/bin
+	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 ; \
+		chmod 600 ${SAMBA_PRIVATE}/smbpasswd ;			\
+	fi
+	chmod 500 ${SAMBA_PRIVATE}
+	chown root.wheel ${PREFIX}/bin/smbpasswd
+	chmod 4111 ${PREFIX}/bin/smbpasswd
 
 .include <bsd.port.mk>
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 7029bc83d152..3d176fe5bc71 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.17p4.tar.gz) = dd8a65242a2bb969a9a5f3d7095df602
+MD5 (samba-1.9.18.tar.gz) = f1ff86c9b41cac82992964168656514f
diff --git a/net/samba/files/README.FreeBSD b/net/samba/files/README.FreeBSD
new file mode 100644
index 000000000000..d04f5ee89bf0
--- /dev/null
+++ b/net/samba/files/README.FreeBSD
@@ -0,0 +1,19 @@
+If you want to use samba ports,
+
+1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf, and edit
+   it.
+2. Copy /usr/local/etc/rc.d/samba.sh.sample to /usr/local/etc/rc.d/samba.sh
+3. Type /usr/local/etc/rc.d/samba.sh or reboot.
+
+See document files in /usr/local/share/doc/samba and example config files in
+/usr/local/share/examples/samba for details.
+
+FreeBSD Samba ports for localization and encrypt passwords support are no
+longer provided because these supports have been integrated into the original
+distribution since 1.9.18.  If you're Western European or Asian (Japanese,
+Chinese, etc.) Windows users, please set "client code page" parameter in
+smb.conf.  See smb.conf.sample for details.  If you want to 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>
diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa
index 6c07f0980471..c99001099c0a 100644
--- a/net/samba/files/patch-aa
+++ b/net/samba/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Sep 27 00:04:52 1997
-+++ Makefile	Wed Oct 15 17:09:58 1997
+--- Makefile.orig	Thu Jan  8 03:29:04 1998
++++ Makefile	Thu Jan  8 14:52:32 1998
 @@ -5,11 +5,11 @@
  ###########################################################################
  
@@ -22,31 +22,21 @@
 -LIBDIR = $(BASEDIR)/lib
 -VARDIR = $(BASEDIR)/var
 +SBINDIR = $(BASEDIR)/sbin
-+ETCDIR = $(BASEDIR)/etc
-+LOGDIR = /var/log
++LIBDIR = $(BASEDIR)/etc
++VARDIR = /var/log
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
-@@ -45,13 +45,13 @@
- # 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
--CONFIGFILE = $(LIBDIR)/smb.conf
--LMHOSTSFILE = $(LIBDIR)/lmhosts
-+SMBLOGFILE = $(LOGDIR)/smb
-+NMBLOGFILE = $(LOGDIR)/nmb
-+CONFIGFILE = $(ETCDIR)/smb.conf
-+LMHOSTSFILE = $(ETCDIR)/lmhosts
+@@ -55,7 +55,7 @@
+ WEB_ROOT = $(BASEDIR)
  
  # the directory where lock files go
 -LOCKDIR = $(VARDIR)/locks
 +LOCKDIR = /var/spool/lock
  
- # set this to the default group you want your machine to appear in
- # for browsing. This can also be set in nmbd (see nmbd(8))
-@@ -383,8 +383,8 @@
+ # 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
@@ -55,16 +45,5 @@
 +FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
 +LIBSM = -lcrypt 
  
- 
- # This is for NEXTSTEP Release 2.X
-@@ -684,8 +684,8 @@
- install: installbin installman installscripts
- 
- installbin: all
--	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
--	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
-+	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
-+	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
- 
- installscripts:
- 	@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+ # This is for OpenBSD
+ # contributed by todd@openbsd.org
diff --git a/net/samba/files/samba.sh.sample b/net/samba/files/samba.sh.sample
new file mode 100644
index 000000000000..50b8968ec6c5
--- /dev/null
+++ b/net/samba/files/samba.sh.sample
@@ -0,0 +1,13 @@
+#!/bin/sh
+smbspool=/var/spool/samba
+smbd=/usr/local/sbin/smbd
+nmbd=/usr/local/sbin/nmbd
+
+if [ -f $smbd ]; then
+	if [ -d $smbspool ]; then
+		rm -f $smbspool/*
+	fi
+	echo -n ' Samba'
+	$smbd -D
+	$nmbd -D
+fi
diff --git a/net/samba/files/smb.conf.default b/net/samba/files/smb.conf.default
new file mode 100644
index 000000000000..051bc7cc023a
--- /dev/null
+++ b/net/samba/files/smb.conf.default
@@ -0,0 +1,257 @@
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options (perhaps too
+# many!) most of which are not shown in this example
+#
+# Any line which starts with a ; (semi-colon) or a # (hash) 
+# is a comment and is ignored. In this example we will use a #
+# for commentry and a ; for parts of the config file that you
+# may wish to enable
+#
+# NOTE: Whenever you modify this file you should run the command "testparm"
+# to check that you have not many any basic syntactic errors. 
+#
+#======================= Global Settings =====================================
+[global]
+
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
+   workgroup = MYGROUP
+
+# server string is the equivalent of the NT Description field
+   server string = Samba Server
+
+# This option is important for security. It allows you to restrict
+# connections to machines which are on your local network. The
+# following example restricts access to two C class networks and
+# the "loopback" interface. For more examples of the syntax see
+# the smb.conf man page
+;   hosts allow = 192.168.1. 192.168.2. 127.
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+   load printers = yes
+
+# you may wish to override the location of the printcap file
+;   printcap name = /etc/printcap
+
+# on SystemV system setting printcap name to lpstat should allow
+# you to automatically obtain a printer list from the SystemV spool
+# system
+;   printcap name = lpstat
+
+# It should not be necessary to specify the print system type unless
+# it is non-standard. Currently supported print systems include:
+# bsd, sysv, plp, lprng, aix, hpux, qnx
+;   printing = bsd
+
+# Uncomment this if you want a guest account, you must add this to /etc/passwd
+# otherwise the user "nobody" is used
+;  guest account = pcguest
+
+# this tells Samba to use a separate log file for each machine
+# that connects
+   log file = __LOGDIR__/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+   max log size = 50
+
+# Security mode. Most people will want user level security. See
+# security_level.txt for details.
+   security = user
+# Use password server option only with security = server
+;   password server = <NT-Server-Name>
+
+# You may wish to use password encryption. Please read
+# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
+# Do not enable this option unless you have read those documents
+;  encrypt passwords = yes
+
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting
+;   include = /usr/local/samba/lib/smb.conf.%m
+
+# Most people will find that this option gives better performance.
+# See speed.txt and the manual pages for details
+   socket options = TCP_NODELAY 
+
+# Configure Samba to use multiple interfaces
+# If you have multiple network interfaces then you must list them
+# here. See the man page for details.
+;   interfaces = 192.168.12.2/24 192.168.13.2/24 
+
+# 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
+;   local master = no
+
+# OS Level determines the precedence of this server in master browser
+# elections. The default value should be reasonable
+;   os level = 33
+
+# Domain Master specifies Samba to be the Domain Master Browser. This
+# allows Samba to collate browse lists between subnets. Don't use this
+# if you already have a Windows NT domain controller doing this job
+;   domain master = yes 
+
+# Preferred Master causes Samba to force a local browser election on startup
+# and gives it a slightly higher chance of winning the election
+;   preferred master = yes
+
+# Use only if you have an NT server on your network that has been
+# configured at install time to be a primary domain controller.
+;   domain controller = <NT-Domain-Controller-SMBName>
+
+# Enable this if you want Samba to be a domain logon server for 
+# Windows95 workstations. 
+;   domain logons = yes
+
+# if you enable domain logons then you may want a per-machine or
+# per user logon script
+# run a specific logon batch file per workstation (machine)
+;   logon script = %m.bat
+# run a specific logon batch file per username
+;   logon script = %U.bat
+
+# Where to store roving profiles (only for Win95 and WinNT)
+#        %L substitutes for this servers netbios name, %U is username
+#        You must uncomment the [Profiles] share below
+;   logon path = \\%L\Profiles\%U
+
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
+;   wins support = yes
+
+# WINS Server - Tells the NMBD components of Samba to be a WINS Client
+#	Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
+;   wins server = w.x.y.z
+
+# WINS Proxy - Tells Samba to answer name resolution queries on
+# behalf of a non WINS capable client, for this to work there must be
+# at least one	WINS Server on the network. The default is NO.
+;   wins proxy = yes
+
+# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
+# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
+# this has been changed in version 1.9.18 to no.
+   dns proxy = no 
+
+# Client codepage setting
+# for Western European users
+; client code page=850
+# for Asian Users (Japanese, Chinese, etc.)
+; client code page=932
+; coding system=cap
+
+#============================ Share Definitions ==============================
+[homes]
+   comment = Home Directories
+   browseable = no
+   writable = yes
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+; [netlogon]
+;   comment = Network Logon Service
+;   path = /usr/local/samba/lib/netlogon
+;   guest ok = yes
+;   writable = no
+;   share modes = no
+
+
+# Un-comment the following to provide a specific roving profile share
+# the default is to use the user's home directory
+;[Profiles]
+;    path = /usr/local/samba/profiles
+;    browseable = no
+;    guest ok = yes
+
+
+# NOTE: If you have a BSD-style print system there is no need to 
+# specifically define each individual printer
+[printers]
+   comment = All Printers
+   path = __SAMBA_SPOOL__
+   browseable = no
+# Set public = yes to allow user 'guest account' to print
+   guest ok = no
+   writable = no
+   printable = yes
+
+# This one is useful for people to share files
+;[tmp]
+;   comment = Temporary file space
+;   path = /tmp
+;   read only = no
+;   public = yes
+
+# A publicly accessible directory, but read only, except for people in
+# the "staff" group
+;[public]
+;   comment = Public Stuff
+;   path = /home/samba
+;   public = yes
+;   writable = yes
+;   printable = no
+;   write list = @staff
+
+# Other examples. 
+#
+# A private printer, usable only by fred. Spool data will be placed in fred's
+# home directory. Note that fred must have write access to the spool directory,
+# wherever it is.
+;[fredsprn]
+;   comment = Fred's Printer
+;   valid users = fred
+;   path = /homes/fred
+;   printer = freds_printer
+;   public = no
+;   writable = no
+;   printable = yes
+
+# A private directory, usable only by fred. Note that fred requires write
+# access to the directory.
+;[fredsdir]
+;   comment = Fred's Service
+;   path = /usr/somewhere/private
+;   valid users = fred
+;   public = no
+;   writable = yes
+;   printable = no
+
+# a service which has a different directory for each machine that connects
+# this allows you to tailor configurations to incoming machines. You could
+# also use the %U option to tailor it by user name.
+# The %m gets replaced with the machine name that is connecting.
+;[pchome]
+;  comment = PC Directories
+;  path = /usr/pc/%m
+;  public = no
+;  writable = yes
+
+# A publicly accessible directory, read/write to all users. Note that all files
+# created in the directory by users will be owned by the default user, so
+# any user with access can delete any other user's files. Obviously this
+# directory must be writable by the default user. Another user could of course
+# be specified, in which case all files would be owned by that user instead.
+;[public]
+;   path = /usr/somewhere/else/public
+;   public = yes
+;   only guest = yes
+;   writable = yes
+;   printable = no
+
+# The following two entries demonstrate how to share a directory so that two
+# users can place files there that will be owned by the specific users. In this
+# setup, the directory should be writable by both users and should have the
+# sticky bit set on it to prevent abuse. Obviously this could be extended to
+# as many users as required.
+;[myshare]
+;   comment = Mary's and Fred's stuff
+;   path = /usr/somewhere/shared
+;   valid users = mary fred
+;   public = no
+;   writable = yes
+;   printable = no
+;   create mask = 0765
+
+
diff --git a/net/samba/pkg-comment b/net/samba/pkg-comment
index 47492e3e2e47..21f25f97e695 100644
--- a/net/samba/pkg-comment
+++ b/net/samba/pkg-comment
@@ -1 +1 @@
-A LanManager(R)-compatible server suite for Unix
+A free SMB and CIFS client and server for UNIX
diff --git a/net/samba/pkg-descr b/net/samba/pkg-descr
index f6ca2487e419..df127661ed82 100644
--- a/net/samba/pkg-descr
+++ b/net/samba/pkg-descr
@@ -8,9 +8,3 @@ or FreeBSD printers as if they were local printers.
 
 Some of the most popular Lan Manager compatible clients include Lan
 Manager itself, Windows for Workgroups, OS/2 and Windows NT.
-
-Please note that if you want to use Windows NT 4.0 + Service Pack 3
-or above as clients, you have to use -des version of samba ports.
--des version is not redistributable as a binary package because of 
-the export control of US.  Please type make install at net/samba-des 
-in ports collection.
diff --git a/net/samba/pkg-plist b/net/samba/pkg-plist
index 077dda64967a..2c64fb8f4739 100644
--- a/net/samba/pkg-plist
+++ b/net/samba/pkg-plist
@@ -7,6 +7,9 @@ bin/smbtar
 bin/addtosmbpass
 bin/testparm
 bin/testprns
+bin/mksmbpasswd.sh
+bin/make_smbcodepage
+bin/make_printerdef
 sbin/smbd
 sbin/nmbd
 man/man1/smbstatus.1.gz
@@ -15,6 +18,7 @@ man/man1/smbrun.1.gz
 man/man1/smbtar.1.gz
 man/man1/testparm.1.gz
 man/man1/testprns.1.gz
+man/man1/make_smbcodepage.1.gz
 man/man5/smb.conf.5.gz
 man/man7/samba.7.gz
 man/man8/smbd.8.gz
@@ -44,6 +48,7 @@ share/doc/samba/faq/sambafaq.txt
 share/doc/samba/Application_Serving.txt
 share/doc/samba/BROWSING.txt
 share/doc/samba/BUGS.txt
+share/doc/samba/CVS_ACCESS.txt
 share/doc/samba/DIAGNOSIS.txt
 share/doc/samba/DNIX.txt
 share/doc/samba/DOMAIN.txt
@@ -52,24 +57,88 @@ 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/NTDOMAIN.txt
 share/doc/samba/NetBIOS.txt
 share/doc/samba/OS2-Client-HOWTO.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/PRINTER_DRIVER.txt
 share/doc/samba/Passwords.txt
 share/doc/samba/Printing.txt
+share/doc/samba/PROJECTS
 share/doc/samba/SCO.txt
 share/doc/samba/Speed.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/WinNT.txt
+share/doc/samba/announce
+share/doc/samba/cifsntdomain.txt
+share/doc/samba/history
 share/doc/samba/security_level.txt
-share/doc/samba/README.DCEDFS
-share/doc/samba/README.jis
-share/doc/samba/README.sambatar
+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.sample
+etc/smb.conf.default
+etc/codepages/codepage.437
+etc/codepages/codepage.850
+etc/codepages/codepage.852
+etc/codepages/codepage.932
+@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