From cba142c8591f6e28100ed84a8fc70f67f2d54280 Mon Sep 17 00:00:00 2001
From: form <form@openbsd.org>
Date: Tue, 11 Aug 1998 13:32:35 +0000
Subject: [PATCH] new README

---
 net/samba/Makefile             |  8 +++----
 net/samba/files/README.OpenBSD | 43 +++++++++++++++++-----------------
 net/samba/pkg/PLIST            |  5 ++--
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/net/samba/Makefile b/net/samba/Makefile
index e2b46be2405..b47978f1701 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -3,7 +3,7 @@
 # Date created:				22 Apr 1998
 # Whom:					form
 #
-# $OpenBSD: Makefile,v 1.12 1998/08/05 02:36:36 form Exp $
+# $OpenBSD: Makefile,v 1.13 1998/08/11 13:32:35 form Exp $
 #
 
 DISTNAME=	samba-1.9.18p8
@@ -19,7 +19,7 @@ MAN5=		smb.conf.5
 MAN7=		samba.7
 MAN8=		smbd.8 nmbd.8 smbpasswd.8
 
-SAMPLE_CONFIG=	/etc/samba/smb.conf.default
+SAMPLE_CONFIG=	${PREFIX}/lib/samba/smb.conf.sample
 SAMBA_SPOOL=	/var/spool/samba
 XSAMBA_SPOOL=	\/var\/spool\/samba
 SAMBA_LOGDIR=	/var/log
@@ -33,7 +33,7 @@ SAMBA_DOCS=${WRKDIR}/${DISTNAME}/docs/INSTALL.sambatar \
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/samba
-	${CP} -rp ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
+	${CP} -r ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/samba/faq
 	${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/samba
@@ -65,7 +65,7 @@ post-install:
 		${CAT} /etc/passwd | ${PREFIX}/bin/mksmbpasswd.sh > /etc/samba/smbpasswd ; \
 		chmod 600 /etc/samba/smbpasswd ;			\
 	fi
-	chown root.wheel ${PREFIX}/bin/smbpasswd
+	chown root.bin ${PREFIX}/bin/smbpasswd
 	chmod 111 ${PREFIX}/bin/smbpasswd
 	more ${FILESDIR}/README.OpenBSD
 
diff --git a/net/samba/files/README.OpenBSD b/net/samba/files/README.OpenBSD
index 14382843e6b..12cf684bf6f 100644
--- a/net/samba/files/README.OpenBSD
+++ b/net/samba/files/README.OpenBSD
@@ -1,27 +1,26 @@
-If you want to use samba ports,
+Using samba package in OpenBSD environment:
 
-1. Copy /etc/samba/smb.conf.default to /etc/samba/smb.conf, and edit
+1. Copy /usr/local/lib/smb.conf.sample to /etc/samba/smb.conf and edit
    it.
-2. Add startup commands to /etc/rc.local:
-	if [ -x /usr/local/sbin/smbd -a -x /usr/local/sbin/nmbd ]
-	then
-		echo -n ' nmbd';	/usr/local/sbin/nmbd -D
-		echo -n ' smbd';	/usr/local/sbin/smbd -D
-	fi
-3. Start samba (see commands above) or reboot.
 
-See document files in /usr/local/share/doc/samba and example config files in
-/usr/local/share/examples/samba for details.
+2. Edit /etc/rc.conf file:
+   ...
+   smbd=YES
+   nmbd=YES
 
-OpenBSD 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 Japanese
-Windows users, please set "client code page" parameter in smb.conf (1.9.18
-does not support Chinese Windows. If you want to use Chinese samba, please
-use chinese/samba port).  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 /etc/samba/smbpasswd for
-authentication.
+3. Edit /etc/rc.local file:
+   echo -n 'starting local daemons:'
+   ...
+   if [ -f /etc/samba/smb.conf ]; then
+       if [ X"${smbd}" = X"YES" -a -x /usr/local/sbin/smbd ]; then
+           echo -n ' smbd';    /usr/local/sbin/smbd -D
+       fi
+       if [ X"${nmbd}" = X"YES" -a -x /usr/local/sbin/nmbd ]; then
+           echo -n ' nmbd';    /usr/local/sbin/nmbd -D
+       fi
+   fi
+   ...
+   echo '.'
 
-OpenBSD port created by Oleg Safiullin <form@vs.itam.nsc.ru>
-	using FreeBSD port by Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
+See documentation files in /usr/local/share/doc/samba and example config
+files in /usr/local/share/examples/samba for more information.
diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST
index 60cf830e529..8497a3ffae2 100644
--- a/net/samba/pkg/PLIST
+++ b/net/samba/pkg/PLIST
@@ -21,6 +21,7 @@ lib/samba/codepages/codepage.932
 lib/samba/codepages/codepage.936
 lib/samba/codepages/codepage.949
 lib/samba/codepages/codepage.950
+lib/samba/smb.conf.sample
 man/man1/make_smbcodepage.1
 man/man1/smbclient.1
 man/man1/smbrun.1
@@ -110,6 +111,6 @@ share/doc/samba/README.sambatar
 @exec if [ ! -f /etc/samba/smbpasswd ]; then /bin/cat /etc/passwd | %D/bin/mksmbpasswd.sh > /etc/samba/smbpasswd; chown root.wheel /etc/samba/smbpasswd; chmod 600 /etc/samba/smbpasswd; fi
 @exec more %D/share/doc/samba/README.OpenBSD
 @unexec echo "***"
-@unexec echo "*** Remove /etc/samba directory and it's contents manually"
-@unexec echo "*** if you won't install samba again."
+@unexec echo "*** Remove /etc/samba directory and its contents manually"
+@unexec echo "*** to complete uninstall procedure."
 @unexec echo "***"