4 files changed, 122 insertions, 65 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 4542767eaf80..ecf6ea2bc2fb 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	samba
-# Version required:			2.0.0
+# Version required:			2.0.2
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.30 1999/01/18 09:28:29 foxfair Exp $
+# $Id: Makefile,v 1.31 1999/02/09 14:00:25 hosokawa Exp $
 #
 
 DISTNAME=	samba-2.0.2
-#PKGNAME=	samba-2.0.0
+#PKGNAME=	samba-2.0.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitcon.no/.7/unix/networking/samba/   \
 		ftp://samba.anu.edu.au/pub/samba/
diff --git a/net/samba/distinfo b/net/samba/distinfo
index c3e117c00a12..6e0ccf0e4a7b 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.0.0.tar.gz) = fb4477a7967a2df752a2a94a493fbe51
+MD5 (samba-2.0.2.tar.gz) = 13df10b71644d9f2a095fc1c652ea1e0
diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa
index c83a3c146655..65fbd41e497b 100644
--- a/net/samba/files/patch-aa
+++ b/net/samba/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Jan 15 05:07:20 1999
-+++ Makefile.in	Fri Jan 15 22:47:59 1999
+--- Makefile.in.orig	Sun Feb  7 07:51:43 1999
++++ Makefile.in	Sun Feb  7 22:09:39 1999
 @@ -23,9 +23,7 @@
  
  BASEDIR= @prefix@
@@ -23,24 +23,22 @@
  CONFIGFILE = $(LIBDIR)/smb.conf
  LMHOSTSFILE = $(LIBDIR)/lmhosts
  DRIVERFILE = $(LIBDIR)/printers.def
-@@ -52,7 +51,10 @@
- SWATDIR = @swatdir@
- 
+@@ -53,6 +52,9 @@
  # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = $(VARDIR)/spool/lock
-+
+ LOCKDIR = @lockdir@
+ 
 +# the directory where pid files go
 +PIDFILEDIR = $(VARDIR)/run
- 
++
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -71,7 +73,7 @@
- PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DSMB_PASSWD_PROGRAM=\"$(SMB_PASSWD_PROGRAM)\"
+ 
+@@ -70,7 +72,7 @@
+ PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
  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)
+ FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba/pkg-plist b/net/samba/pkg-plist
index 0a9ca3f6c417..3fedc2427bd0 100644
--- a/net/samba/pkg-plist
+++ b/net/samba/pkg-plist
@@ -74,61 +74,16 @@ etc/codepages/codepage.950
 @dirrm etc/codepages
 share/doc/samba/COPYING
 share/doc/samba/Manifest
+share/doc/samba/NT4_PlainPassword.reg
 share/doc/samba/README
 share/doc/samba/README.FreeBSD
 share/doc/samba/README.swat
+share/doc/samba/Read-Manifest-Now
 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
-share/doc/samba/DHCP-Server-Configuration.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/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/Macintosh_Clients.txt
-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.DCEDFS
-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/UNIX-SMB.txt
-share/doc/samba/UNIX_INSTALL.txt
-share/doc/samba/UNIX_SECURITY.txt
-share/doc/samba/Win95.txt
-share/doc/samba/WinNT.txt
-share/doc/samba/cifsntdomain.txt
-share/doc/samba/security_level.txt
-share/doc/samba/NT4_PlainPassword.reg
+share/doc/samba/WHATSNEW.txt
 share/doc/samba/Win95_PlainPassword.reg
+share/doc/samba/announce
 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
@@ -150,7 +105,111 @@ 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/history
+share/doc/samba/htmldocs/DOMAIN_MEMBER.html
+share/doc/samba/htmldocs/lmhosts.5.html
+share/doc/samba/htmldocs/make_smbcodepage.1.html
+share/doc/samba/htmldocs/nmbd.8.html
+share/doc/samba/htmldocs/nmblookup.1.html
+share/doc/samba/htmldocs/samba.7.html
+share/doc/samba/htmldocs/smb.conf.5.html
+share/doc/samba/htmldocs/smbclient.1.html
+share/doc/samba/htmldocs/smbd.8.html
+share/doc/samba/htmldocs/smbpasswd.5.html
+share/doc/samba/htmldocs/smbpasswd.8.html
+share/doc/samba/htmldocs/smbrun.1.html
+share/doc/samba/htmldocs/smbstatus.1.html
+share/doc/samba/htmldocs/smbtar.1.html
+share/doc/samba/htmldocs/swat.8.html
+share/doc/samba/htmldocs/testparm.1.html
+share/doc/samba/htmldocs/testprns.1.html
+share/doc/samba/htmldocs/wfw_slip.htm
+share/doc/samba/manpages/lmhosts.5
+share/doc/samba/manpages/make_smbcodepage.1
+share/doc/samba/manpages/nmbd.8
+share/doc/samba/manpages/nmblookup.1
+share/doc/samba/manpages/samba.7
+share/doc/samba/manpages/smb.conf.5
+share/doc/samba/manpages/smbclient.1
+share/doc/samba/manpages/smbd.8
+share/doc/samba/manpages/smbmnt.8
+share/doc/samba/manpages/smbmount.8
+share/doc/samba/manpages/smbpasswd.5
+share/doc/samba/manpages/smbpasswd.8
+share/doc/samba/manpages/smbrun.1
+share/doc/samba/manpages/smbstatus.1
+share/doc/samba/manpages/smbtar.1
+share/doc/samba/manpages/smbumount.8
+share/doc/samba/manpages/swat.8
+share/doc/samba/manpages/testparm.1
+share/doc/samba/manpages/testprns.1
+share/doc/samba/textdocs/Application_Serving.txt
+share/doc/samba/textdocs/BROWSING-Config.txt
+share/doc/samba/textdocs/BROWSING.txt
+share/doc/samba/textdocs/BUGS.txt
+share/doc/samba/textdocs/CVS_ACCESS.txt
+share/doc/samba/textdocs/DHCP-Server-Configuration.txt
+share/doc/samba/textdocs/DIAGNOSIS.txt
+share/doc/samba/textdocs/DNIX.txt
+share/doc/samba/textdocs/DOMAIN.txt
+share/doc/samba/textdocs/DOMAIN_CONTROL.txt
+share/doc/samba/textdocs/DOMAIN_MEMBER.txt
+share/doc/samba/textdocs/ENCRYPTION.txt
+share/doc/samba/textdocs/Faxing.txt
+share/doc/samba/textdocs/GOTCHAS.txt
+share/doc/samba/textdocs/HINTS.txt
+share/doc/samba/textdocs/INSTALL.sambatar
+share/doc/samba/textdocs/MIRRORS.txt
+share/doc/samba/textdocs/Macintosh_Clients.txt
+share/doc/samba/textdocs/NTDOMAIN.txt
+share/doc/samba/textdocs/NetBIOS.txt
+share/doc/samba/textdocs/OS2-Client-HOWTO.txt
+share/doc/samba/textdocs/PRINTER_DRIVER.txt
+share/doc/samba/textdocs/PROFILES.txt
+share/doc/samba/textdocs/PROJECTS
+share/doc/samba/textdocs/Passwords.txt
+share/doc/samba/textdocs/Printing.txt
+share/doc/samba/textdocs/README.DCEDFS
+share/doc/samba/textdocs/README.jis
+share/doc/samba/textdocs/README.sambatar
+share/doc/samba/textdocs/Recent-FAQs.txt
+share/doc/samba/textdocs/RoutedNetworks.txt
+share/doc/samba/textdocs/SCO.txt
+share/doc/samba/textdocs/SMBTAR.notes
+share/doc/samba/textdocs/SSLeay.txt
+share/doc/samba/textdocs/Speed.txt
+share/doc/samba/textdocs/Speed2.txt
+share/doc/samba/textdocs/Support.txt
+share/doc/samba/textdocs/Tracing.txt
+share/doc/samba/textdocs/UNIX-SMB.txt
+share/doc/samba/textdocs/UNIX_INSTALL.txt
+share/doc/samba/textdocs/UNIX_SECURITY.txt
+share/doc/samba/textdocs/Win95.txt
+share/doc/samba/textdocs/WinNT.txt
+share/doc/samba/textdocs/cifsntdomain.txt
+share/doc/samba/textdocs/security_level.txt
+share/doc/samba/yodldocs/DOMAIN_MEMBER.yo
+share/doc/samba/yodldocs/lmhosts.5.yo
+share/doc/samba/yodldocs/make_smbcodepage.1.yo
+share/doc/samba/yodldocs/nmbd.8.yo
+share/doc/samba/yodldocs/nmblookup.1.yo
+share/doc/samba/yodldocs/samba.7.yo
+share/doc/samba/yodldocs/smb.conf.5.yo
+share/doc/samba/yodldocs/smbclient.1.yo
+share/doc/samba/yodldocs/smbd.8.yo
+share/doc/samba/yodldocs/smbpasswd.5.yo
+share/doc/samba/yodldocs/smbpasswd.8.yo
+share/doc/samba/yodldocs/smbrun.1.yo
+share/doc/samba/yodldocs/smbstatus.1.yo
+share/doc/samba/yodldocs/smbtar.1.yo
+share/doc/samba/yodldocs/swat.8.yo
+share/doc/samba/yodldocs/testparm.1.yo
+share/doc/samba/yodldocs/testprns.1.yo
 @dirrm share/doc/samba/faq
+@dirrm share/doc/samba/htmldocs
+@dirrm share/doc/samba/manpages
+@dirrm share/doc/samba/textdocs
+@dirrm share/doc/samba/yodldocs
 @dirrm share/doc/samba
 share/swat/help/welcome.html
 share/swat/help/DOMAIN_MEMBER.html