Upgrade, 1.9.15P8 -> 1.9.17P4.

Closes part 1/2 of
This modification includes:
* Install docs to share/doc/samba.
* Install sample config files.

Also, please note that the maintainer is now hosokawa@jp.freebsd.org.
PR:	4830
Submitted by:	hosokawa@jp.freebsd.org

15 files changed, 342 insertions, 96 deletions

diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 00086daf16b0..1505fbf9ded1 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -1,24 +1,60 @@
 # New ports collection makefile for:	samba
-# Version required:			1.9.15p8
+# Version required:			1.9.17p4
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1997/09/27 01:58:09 pst Exp $
+# $Id: Makefile,v 1.3 1997/10/15 09:02:45 max Exp $
 #
 
-DISTNAME=	samba-1.9.17p2
-CATEGORIES=	net
+DISTNAME=	samba-1.9.17p4
+PKGNAME=	ja-samba-1.9.17.4
+CATEGORIES=	japanese net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
-WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	hosokawa@jp.FreeBSD.ORG
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/source
 MAN1=		smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1
 MAN5=		smb.conf.5
 MAN7=		samba.7
 MAN8=		smbd.8 nmbd.8 smbpasswd.8
 
-pre-install:
-	@${MKDIR} /usr/local/samba
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
+SAMPLE_CONFIG=	${PREFIX}/etc/smb.conf.sample
+SAMBA_SPOOL=	/var/spool/samba
+XSAMBA_SPOOL=	\/var\/spool\/samba
+SAMBA_LOGDIR=	/var/log
+XSAMBA_LOGDIR=	\/var\/log
+
+post-install:
+.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 ; \
+	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." ;	\
+		${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};			\
+	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			\
+			> ${SAMPLE_CONFIG} ;				\
+	fi
 
 .include <bsd.port.mk>
diff --git a/net/samba-devel/distinfo b/net/samba-devel/distinfo
index d89f0c7fae14..7029bc83d152 100644
--- a/net/samba-devel/distinfo
+++ b/net/samba-devel/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.17p2.tar.gz) = 27ac28ccf084268ba5c8c0b3a0ed12e4
+MD5 (samba-1.9.17p4.tar.gz) = dd8a65242a2bb969a9a5f3d7095df602
diff --git a/net/samba-devel/files/patch-aa b/net/samba-devel/files/patch-aa
index 63286ab75b50..6271a125aff1 100644
--- a/net/samba-devel/files/patch-aa
+++ b/net/samba-devel/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Sep 26 05:44:18 1997
-+++ Makefile	Fri Sep 26 18:41:40 1997
+--- Makefile.orig	Sat Sep 27 00:04:52 1997
++++ Makefile	Wed Oct 15 17:09:58 1997
 @@ -5,11 +5,11 @@
  ###########################################################################
  
@@ -27,7 +27,7 @@
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
-@@ -48,13 +48,13 @@
+@@ -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))
@@ -46,19 +46,18 @@
  
  # 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))
-@@ -385,9 +385,8 @@
- 
+@@ -383,8 +383,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
+ # NOTE: You may need to add -DBSD44 if you have password problems
 -# FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
 -# LIBSM = -lcrypt 
-+FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
++FLAGSM = -DFreeBSD -DFAST_SHARE_MODES -DKANJI=\"cap\"
 +LIBSM = -lcrypt 
  
  
  # This is for NEXTSTEP Release 2.X
-@@ -687,8 +686,8 @@
+@@ -684,8 +684,8 @@
  install: installbin installman installscripts
  
  installbin: all
@@ -69,14 +68,3 @@
  
  installscripts:
  	@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -707,8 +706,8 @@
- 	@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
- 
- uninstallbin:
--	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
--	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
-+	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
-+	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
- 
- uninstallscripts:
- 	@$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
diff --git a/net/samba-devel/pkg-descr b/net/samba-devel/pkg-descr
index d9e59d1acba9..f6ca2487e419 100644
--- a/net/samba-devel/pkg-descr
+++ b/net/samba-devel/pkg-descr
@@ -9,3 +9,8 @@ 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-devel/pkg-plist b/net/samba-devel/pkg-plist
index 38682ae06839..077dda64967a 100644
--- a/net/samba-devel/pkg-plist
+++ b/net/samba-devel/pkg-plist
@@ -1,17 +1,17 @@
-bin/addtosmbpass
-bin/nmblookup
 bin/smbclient
-bin/smbpasswd
 bin/smbrun
 bin/smbstatus
+bin/smbpasswd
+bin/nmblookup
 bin/smbtar
+bin/addtosmbpass
 bin/testparm
 bin/testprns
 sbin/smbd
 sbin/nmbd
+man/man1/smbstatus.1.gz
 man/man1/smbclient.1.gz
 man/man1/smbrun.1.gz
-man/man1/smbstatus.1.gz
 man/man1/smbtar.1.gz
 man/man1/testparm.1.gz
 man/man1/testprns.1.gz
@@ -20,3 +20,56 @@ man/man7/samba.7.gz
 man/man8/smbd.8.gz
 man/man8/nmbd.8.gz
 man/man8/smbpasswd.8.gz
+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
+share/doc/samba/Application_Serving.txt
+share/doc/samba/BROWSING.txt
+share/doc/samba/BUGS.txt
+share/doc/samba/DIAGNOSIS.txt
+share/doc/samba/DNIX.txt
+share/doc/samba/DOMAIN.txt
+share/doc/samba/DOMAIN_CONTROL.txt
+share/doc/samba/ENCRYPTION.txt
+share/doc/samba/Faxing.txt
+share/doc/samba/GOTCHAS.txt
+share/doc/samba/HINTS.txt
+share/doc/samba/MIRRORS.txt
+share/doc/samba/NetBIOS.txt
+share/doc/samba/OS2-Client-HOWTO.txt
+share/doc/samba/Passwords.txt
+share/doc/samba/Printing.txt
+share/doc/samba/SCO.txt
+share/doc/samba/Speed.txt
+share/doc/samba/Support.txt
+share/doc/samba/Tracing.txt
+share/doc/samba/UNIX-SMB.txt
+share/doc/samba/Win95.txt
+share/doc/samba/UNIX_INSTALL.txt
+share/doc/samba/WinNT.txt
+share/doc/samba/security_level.txt
+share/doc/samba/README.DCEDFS
+share/doc/samba/README.jis
+share/doc/samba/README.sambatar
+etc/rc.d/samba.sh.sample
+etc/smb.conf.sample
+@dirrm share/doc/samba/faq
+@dirrm share/doc/samba
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 00086daf16b0..1505fbf9ded1 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,24 +1,60 @@
 # New ports collection makefile for:	samba
-# Version required:			1.9.15p8
+# Version required:			1.9.17p4
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1997/09/27 01:58:09 pst Exp $
+# $Id: Makefile,v 1.3 1997/10/15 09:02:45 max Exp $
 #
 
-DISTNAME=	samba-1.9.17p2
-CATEGORIES=	net
+DISTNAME=	samba-1.9.17p4
+PKGNAME=	ja-samba-1.9.17.4
+CATEGORIES=	japanese net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
-WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	hosokawa@jp.FreeBSD.ORG
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/source
 MAN1=		smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1
 MAN5=		smb.conf.5
 MAN7=		samba.7
 MAN8=		smbd.8 nmbd.8 smbpasswd.8
 
-pre-install:
-	@${MKDIR} /usr/local/samba
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
+SAMPLE_CONFIG=	${PREFIX}/etc/smb.conf.sample
+SAMBA_SPOOL=	/var/spool/samba
+XSAMBA_SPOOL=	\/var\/spool\/samba
+SAMBA_LOGDIR=	/var/log
+XSAMBA_LOGDIR=	\/var\/log
+
+post-install:
+.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 ; \
+	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." ;	\
+		${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};			\
+	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			\
+			> ${SAMPLE_CONFIG} ;				\
+	fi
 
 .include <bsd.port.mk>
diff --git a/net/samba/distinfo b/net/samba/distinfo
index d89f0c7fae14..7029bc83d152 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.17p2.tar.gz) = 27ac28ccf084268ba5c8c0b3a0ed12e4
+MD5 (samba-1.9.17p4.tar.gz) = dd8a65242a2bb969a9a5f3d7095df602
diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa
index 63286ab75b50..6271a125aff1 100644
--- a/net/samba/files/patch-aa
+++ b/net/samba/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Sep 26 05:44:18 1997
-+++ Makefile	Fri Sep 26 18:41:40 1997
+--- Makefile.orig	Sat Sep 27 00:04:52 1997
++++ Makefile	Wed Oct 15 17:09:58 1997
 @@ -5,11 +5,11 @@
  ###########################################################################
  
@@ -27,7 +27,7 @@
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
-@@ -48,13 +48,13 @@
+@@ -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))
@@ -46,19 +46,18 @@
  
  # 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))
-@@ -385,9 +385,8 @@
- 
+@@ -383,8 +383,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
+ # NOTE: You may need to add -DBSD44 if you have password problems
 -# FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
 -# LIBSM = -lcrypt 
-+FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
++FLAGSM = -DFreeBSD -DFAST_SHARE_MODES -DKANJI=\"cap\"
 +LIBSM = -lcrypt 
  
  
  # This is for NEXTSTEP Release 2.X
-@@ -687,8 +686,8 @@
+@@ -684,8 +684,8 @@
  install: installbin installman installscripts
  
  installbin: all
@@ -69,14 +68,3 @@
  
  installscripts:
  	@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -707,8 +706,8 @@
- 	@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
- 
- uninstallbin:
--	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
--	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
-+	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
-+	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
- 
- uninstallscripts:
- 	@$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
diff --git a/net/samba/pkg-descr b/net/samba/pkg-descr
index d9e59d1acba9..f6ca2487e419 100644
--- a/net/samba/pkg-descr
+++ b/net/samba/pkg-descr
@@ -9,3 +9,8 @@ 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 38682ae06839..077dda64967a 100644
--- a/net/samba/pkg-plist
+++ b/net/samba/pkg-plist
@@ -1,17 +1,17 @@
-bin/addtosmbpass
-bin/nmblookup
 bin/smbclient
-bin/smbpasswd
 bin/smbrun
 bin/smbstatus
+bin/smbpasswd
+bin/nmblookup
 bin/smbtar
+bin/addtosmbpass
 bin/testparm
 bin/testprns
 sbin/smbd
 sbin/nmbd
+man/man1/smbstatus.1.gz
 man/man1/smbclient.1.gz
 man/man1/smbrun.1.gz
-man/man1/smbstatus.1.gz
 man/man1/smbtar.1.gz
 man/man1/testparm.1.gz
 man/man1/testprns.1.gz
@@ -20,3 +20,56 @@ man/man7/samba.7.gz
 man/man8/smbd.8.gz
 man/man8/nmbd.8.gz
 man/man8/smbpasswd.8.gz
+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
+share/doc/samba/Application_Serving.txt
+share/doc/samba/BROWSING.txt
+share/doc/samba/BUGS.txt
+share/doc/samba/DIAGNOSIS.txt
+share/doc/samba/DNIX.txt
+share/doc/samba/DOMAIN.txt
+share/doc/samba/DOMAIN_CONTROL.txt
+share/doc/samba/ENCRYPTION.txt
+share/doc/samba/Faxing.txt
+share/doc/samba/GOTCHAS.txt
+share/doc/samba/HINTS.txt
+share/doc/samba/MIRRORS.txt
+share/doc/samba/NetBIOS.txt
+share/doc/samba/OS2-Client-HOWTO.txt
+share/doc/samba/Passwords.txt
+share/doc/samba/Printing.txt
+share/doc/samba/SCO.txt
+share/doc/samba/Speed.txt
+share/doc/samba/Support.txt
+share/doc/samba/Tracing.txt
+share/doc/samba/UNIX-SMB.txt
+share/doc/samba/Win95.txt
+share/doc/samba/UNIX_INSTALL.txt
+share/doc/samba/WinNT.txt
+share/doc/samba/security_level.txt
+share/doc/samba/README.DCEDFS
+share/doc/samba/README.jis
+share/doc/samba/README.sambatar
+etc/rc.d/samba.sh.sample
+etc/smb.conf.sample
+@dirrm share/doc/samba/faq
+@dirrm share/doc/samba
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 00086daf16b0..1505fbf9ded1 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -1,24 +1,60 @@
 # New ports collection makefile for:	samba
-# Version required:			1.9.15p8
+# Version required:			1.9.17p4
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1997/09/27 01:58:09 pst Exp $
+# $Id: Makefile,v 1.3 1997/10/15 09:02:45 max Exp $
 #
 
-DISTNAME=	samba-1.9.17p2
-CATEGORIES=	net
+DISTNAME=	samba-1.9.17p4
+PKGNAME=	ja-samba-1.9.17.4
+CATEGORIES=	japanese net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
-WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	hosokawa@jp.FreeBSD.ORG
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/source
 MAN1=		smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1
 MAN5=		smb.conf.5
 MAN7=		samba.7
 MAN8=		smbd.8 nmbd.8 smbpasswd.8
 
-pre-install:
-	@${MKDIR} /usr/local/samba
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
+SAMPLE_CONFIG=	${PREFIX}/etc/smb.conf.sample
+SAMBA_SPOOL=	/var/spool/samba
+XSAMBA_SPOOL=	\/var\/spool\/samba
+SAMBA_LOGDIR=	/var/log
+XSAMBA_LOGDIR=	\/var\/log
+
+post-install:
+.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 ; \
+	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." ;	\
+		${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};			\
+	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			\
+			> ${SAMPLE_CONFIG} ;				\
+	fi
 
 .include <bsd.port.mk>
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index d89f0c7fae14..7029bc83d152 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-1.9.17p2.tar.gz) = 27ac28ccf084268ba5c8c0b3a0ed12e4
+MD5 (samba-1.9.17p4.tar.gz) = dd8a65242a2bb969a9a5f3d7095df602
diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa
index 63286ab75b50..6271a125aff1 100644
--- a/net/samba3/files/patch-aa
+++ b/net/samba3/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Sep 26 05:44:18 1997
-+++ Makefile	Fri Sep 26 18:41:40 1997
+--- Makefile.orig	Sat Sep 27 00:04:52 1997
++++ Makefile	Wed Oct 15 17:09:58 1997
 @@ -5,11 +5,11 @@
  ###########################################################################
  
@@ -27,7 +27,7 @@
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
-@@ -48,13 +48,13 @@
+@@ -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))
@@ -46,19 +46,18 @@
  
  # 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))
-@@ -385,9 +385,8 @@
- 
+@@ -383,8 +383,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
+ # NOTE: You may need to add -DBSD44 if you have password problems
 -# FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
 -# LIBSM = -lcrypt 
-+FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
++FLAGSM = -DFreeBSD -DFAST_SHARE_MODES -DKANJI=\"cap\"
 +LIBSM = -lcrypt 
  
  
  # This is for NEXTSTEP Release 2.X
-@@ -687,8 +686,8 @@
+@@ -684,8 +684,8 @@
  install: installbin installman installscripts
  
  installbin: all
@@ -69,14 +68,3 @@
  
  installscripts:
  	@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -707,8 +706,8 @@
- 	@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
- 
- uninstallbin:
--	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
--	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
-+	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
-+	@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
- 
- uninstallscripts:
- 	@$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
diff --git a/net/samba3/pkg-descr b/net/samba3/pkg-descr
index d9e59d1acba9..f6ca2487e419 100644
--- a/net/samba3/pkg-descr
+++ b/net/samba3/pkg-descr
@@ -9,3 +9,8 @@ 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/samba3/pkg-plist b/net/samba3/pkg-plist
index 38682ae06839..077dda64967a 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -1,17 +1,17 @@
-bin/addtosmbpass
-bin/nmblookup
 bin/smbclient
-bin/smbpasswd
 bin/smbrun
 bin/smbstatus
+bin/smbpasswd
+bin/nmblookup
 bin/smbtar
+bin/addtosmbpass
 bin/testparm
 bin/testprns
 sbin/smbd
 sbin/nmbd
+man/man1/smbstatus.1.gz
 man/man1/smbclient.1.gz
 man/man1/smbrun.1.gz
-man/man1/smbstatus.1.gz
 man/man1/smbtar.1.gz
 man/man1/testparm.1.gz
 man/man1/testprns.1.gz
@@ -20,3 +20,56 @@ man/man7/samba.7.gz
 man/man8/smbd.8.gz
 man/man8/nmbd.8.gz
 man/man8/smbpasswd.8.gz
+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
+share/doc/samba/Application_Serving.txt
+share/doc/samba/BROWSING.txt
+share/doc/samba/BUGS.txt
+share/doc/samba/DIAGNOSIS.txt
+share/doc/samba/DNIX.txt
+share/doc/samba/DOMAIN.txt
+share/doc/samba/DOMAIN_CONTROL.txt
+share/doc/samba/ENCRYPTION.txt
+share/doc/samba/Faxing.txt
+share/doc/samba/GOTCHAS.txt
+share/doc/samba/HINTS.txt
+share/doc/samba/MIRRORS.txt
+share/doc/samba/NetBIOS.txt
+share/doc/samba/OS2-Client-HOWTO.txt
+share/doc/samba/Passwords.txt
+share/doc/samba/Printing.txt
+share/doc/samba/SCO.txt
+share/doc/samba/Speed.txt
+share/doc/samba/Support.txt
+share/doc/samba/Tracing.txt
+share/doc/samba/UNIX-SMB.txt
+share/doc/samba/Win95.txt
+share/doc/samba/UNIX_INSTALL.txt
+share/doc/samba/WinNT.txt
+share/doc/samba/security_level.txt
+share/doc/samba/README.DCEDFS
+share/doc/samba/README.jis
+share/doc/samba/README.sambatar
+etc/rc.d/samba.sh.sample
+etc/smb.conf.sample
+@dirrm share/doc/samba/faq
+@dirrm share/doc/samba