4 files changed, 42 insertions, 10 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 0652d9f93dee..bfd55e9ad0ea 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -3,11 +3,11 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.21 1998/02/19 10:11:41 hosokawa Exp $
+# $Id: Makefile,v 1.22 1998/04/11 03:05:51 hosokawa Exp $
 #
 
-DISTNAME=	samba-1.9.18p4
-PKGNAME=	samba-1.9.18.4
+DISTNAME=	samba-1.9.18p6
+PKGNAME=	samba-1.9.18.6
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 
@@ -32,6 +32,7 @@ SAMBA_DOCS=${WRKDIR}/${DISTNAME}/docs/INSTALL.sambatar \
 	${WRKDIR}/${DISTNAME}/docs/history \
 	${WRKDIR}/${DISTNAME}/docs/announce \
 	${WRKDIR}/${DISTNAME}/docs/PROJECTS \
+	${WRKDIR}/${DISTNAME}/docs/SMBTAR.notes
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/samba
diff --git a/net/samba/distinfo b/net/samba/distinfo
index add3620044b1..f29ae54eabae 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.18p4.tar.gz) = 6ee1a2b386f4f3d32c12c8078caee443
+MD5 (samba-1.9.18p6.tar.gz) = 630b9de2805133d460036bb2a970997b
diff --git a/net/samba/files/smb.conf.default b/net/samba/files/smb.conf.default
index 4fab264c7c09..9030ed0422ea 100644
--- a/net/samba/files/smb.conf.default
+++ b/net/samba/files/smb.conf.default
@@ -159,13 +159,33 @@
 # Be very careful with case sensitivity - it can break things!
 ;  case sensitive = no
 
-# Client codepage setting
-# for Western European users
+# Client codepage settings
+
+# for European users (Latin 1)
 ; client code page=850
+
+# for European users (Latin 2)
+; client code page=852
+
+# 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:
diff --git a/net/samba/pkg-plist b/net/samba/pkg-plist
index cec3b69248cf..4b112067a896 100644
--- a/net/samba/pkg-plist
+++ b/net/samba/pkg-plist
@@ -49,6 +49,7 @@ 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/DHCP-Server-Configuration.txt
 share/doc/samba/DIAGNOSIS.txt
 share/doc/samba/DNIX.txt
 share/doc/samba/DOMAIN.txt
@@ -63,17 +64,20 @@ 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/PRINTER_DRIVER.txt
+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/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/SMBTAR.notes
 share/doc/samba/Speed.txt
+share/doc/samba/Speed2.txt
 share/doc/samba/Support.txt
 share/doc/samba/Tracing.txt
 share/doc/samba/THANKS
@@ -88,6 +92,9 @@ share/doc/samba/cifsntdomain.txt
 share/doc/samba/history
 share/doc/samba/security_level.txt
 share/doc/samba/wfw_slip.htm
+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/tridge/smb.conf.WinNT
@@ -125,6 +132,9 @@ etc/codepages/codepage.850
 etc/codepages/codepage.852
 etc/codepages/codepage.866
 etc/codepages/codepage.932
+etc/codepages/codepage.936
+etc/codepages/codepage.949
+etc/codepages/codepage.950
 @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
@@ -132,6 +142,7 @@ etc/codepages/codepage.932
 @unexec rm -rf /var/spool/samba
 @dirrm share/doc/samba/faq
 @dirrm share/doc/samba
+@dirrm share/examples/samba/autofs
 @dirrm share/examples/samba/dce-dfs
 @dirrm share/examples/samba/tridge
 @dirrm share/examples/samba/thoralf