5 files changed, 174 insertions, 19 deletions

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 84711fcbd400..6ebbf6f6d140 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.2.0a3
+PORTVERSION=	2.2.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
 		ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
 		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
-MASTER_SITE_SUBDIR= alpha
-DISTNAME=       samba-2.2.0-alpha3
+MASTER_SITE_SUBDIR= . old alpha
+DISTNAME=       samba-${PORTVERSION}
 
 MAINTAINER=	dwcjr@inethouston.net
 
-NO_LATEST_LINK=	"Unstable, development version."
-
 # directories
 VARDIR=		/var
 SAMBA_SPOOL=	${VARDIR}/spool/samba
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index ee19489cd22a..2b9fdb9b43b4 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-2.2.0-alpha3.tar.gz) = 871f8656c6aeb01020c55d334b9f047b
+MD5 (samba-2.2.0.tar.gz) = fb1f7d52bfa6cef6c2b471ff3981e2a6
diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa
index 25b34dc94d86..af170104b851 100644
--- a/net/samba3/files/patch-aa
+++ b/net/samba3/files/patch-aa
@@ -28,7 +28,7 @@
  PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
  FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
  FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
--FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
+-FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -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
diff --git a/net/samba3/files/patch-af b/net/samba3/files/patch-af
deleted file mode 100644
index 4d0b8cd2da0e..000000000000
--- a/net/samba3/files/patch-af
+++ /dev/null
@@ -1,9 +0,0 @@
---- script/updatesmbpasswd.sh.orig	Sat May  4 16:50:45 1996
-+++ script/updatesmbpasswd.sh	Wed Feb 10 01:21:05 1999
-@@ -1,5 +1,5 @@
- #!/bin/sh
--nawk 'BEGIN {FS=":"} 
-+awk 'BEGIN {FS=":"} 
- {
- 	if( $0 ~ "^#" ) {
- 		print $0
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 4ef468290da9..04928b54d697 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -12,7 +12,6 @@ bin/rpcclient
 bin/nmblookup
 bin/make_printerdef
 bin/smbtar
-bin/addtosmbpass
 bin/convert_smbpasswd
 bin/make_smbpasswd
 etc/rc.d/samba.sh.sample
@@ -93,8 +92,11 @@ share/doc/samba/faq/sambafaq.html
 share/doc/samba/faq/sambafaq.sgml
 share/doc/samba/faq/sambafaq.txt
 share/doc/samba/htmldocs/DOMAIN_MEMBER.html
+share/doc/samba/htmldocs/ENCRYPTION.html
 share/doc/samba/htmldocs/NT_Security.html
+share/doc/samba/htmldocs/OS2-Client-HOWTO.html
 share/doc/samba/htmldocs/Samba-HOWTO-Collection.html
+share/doc/samba/htmldocs/Samba-PDC-HOWTO.html
 share/doc/samba/htmldocs/UNIX_INSTALL.html
 share/doc/samba/htmldocs/findsmb.1.html
 share/doc/samba/htmldocs/lmhosts.5.html
@@ -138,7 +140,6 @@ 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/Faxing.txt
 share/doc/samba/textdocs/GOTCHAS.txt
 share/doc/samba/textdocs/HINTS.txt
@@ -148,7 +149,6 @@ 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
@@ -200,6 +200,7 @@ share/examples/samba/appliance/smb.conf-appliance
 share/examples/samba/appliance/Makefile
 share/examples/samba/appliance/build.sh
 share/examples/samba/printing/smbprint
+share/examples/samba/printing/smbprint.newer
 share/examples/samba/printing/smbprint.sysv
 share/examples/samba/validchars/validchr.com
 share/examples/samba/validchars/readme
@@ -220,10 +221,172 @@ share/examples/samba/printer-accounting/lp-acct
 share/examples/samba/printer-accounting/printcap
 share/examples/samba/smb.conf.default
 share/examples/samba/README
+share/swat/using_samba/figs/sam.0101.gif
+share/swat/using_samba/figs/sam.0102.gif
+share/swat/using_samba/figs/sam.0103.gif
+share/swat/using_samba/figs/sam.0104.gif
+share/swat/using_samba/figs/sam.0105.gif
+share/swat/using_samba/figs/sam.0106.gif
+share/swat/using_samba/figs/sam.0107.gif
+share/swat/using_samba/figs/sam.0108.gif
+share/swat/using_samba/figs/sam.0109.gif
+share/swat/using_samba/figs/sam.0110.gif
+share/swat/using_samba/figs/sam.0111.gif
+share/swat/using_samba/figs/sam.0112.gif
+share/swat/using_samba/figs/sam.0113.gif
+share/swat/using_samba/figs/sam.0114.gif
+share/swat/using_samba/figs/sam.0201.gif
+share/swat/using_samba/figs/sam.0202.gif
+share/swat/using_samba/figs/sam.0203.gif
+share/swat/using_samba/figs/sam.0204.gif
+share/swat/using_samba/figs/sam.0301.gif
+share/swat/using_samba/figs/sam.0302.gif
+share/swat/using_samba/figs/sam.0303.gif
+share/swat/using_samba/figs/sam.0304.gif
+share/swat/using_samba/figs/sam.0305.gif
+share/swat/using_samba/figs/sam.0306.gif
+share/swat/using_samba/figs/sam.0307.gif
+share/swat/using_samba/figs/sam.0308.gif
+share/swat/using_samba/figs/sam.0309.gif
+share/swat/using_samba/figs/sam.0310.gif
+share/swat/using_samba/figs/sam.0311.gif
+share/swat/using_samba/figs/sam.0312.gif
+share/swat/using_samba/figs/sam.0313.gif
+share/swat/using_samba/figs/sam.0314.gif
+share/swat/using_samba/figs/sam.0315.gif
+share/swat/using_samba/figs/sam.0316.gif
+share/swat/using_samba/figs/sam.0317.gif
+share/swat/using_samba/figs/sam.0318.gif
+share/swat/using_samba/figs/sam.0319.gif
+share/swat/using_samba/figs/sam.0320.gif
+share/swat/using_samba/figs/sam.0321.gif
+share/swat/using_samba/figs/sam.0322.gif
+share/swat/using_samba/figs/sam.0323.gif
+share/swat/using_samba/figs/sam.0324.gif
+share/swat/using_samba/figs/sam.0325.gif
+share/swat/using_samba/figs/sam.0326.gif
+share/swat/using_samba/figs/sam.0327.gif
+share/swat/using_samba/figs/sam.0328.gif
+share/swat/using_samba/figs/sam.0401.gif
+share/swat/using_samba/figs/sam.0402.gif
+share/swat/using_samba/figs/sam.0403.gif
+share/swat/using_samba/figs/sam.0404.gif
+share/swat/using_samba/figs/sam.0405.gif
+share/swat/using_samba/figs/sam.0406.gif
+share/swat/using_samba/figs/sam.0407.gif
+share/swat/using_samba/figs/sam.0501.gif
+share/swat/using_samba/figs/sam.0502.gif
+share/swat/using_samba/figs/sam.0503.gif
+share/swat/using_samba/figs/sam.0504.gif
+share/swat/using_samba/figs/sam.0505.gif
+share/swat/using_samba/figs/sam.0506.gif
+share/swat/using_samba/figs/sam.0507.gif
+share/swat/using_samba/figs/sam.0508.gif
+share/swat/using_samba/figs/sam.0601.gif
+share/swat/using_samba/figs/sam.0602.gif
+share/swat/using_samba/figs/sam.0603.gif
+share/swat/using_samba/figs/sam.0604.gif
+share/swat/using_samba/figs/sam.0605.gif
+share/swat/using_samba/figs/sam.0606.gif
+share/swat/using_samba/figs/sam.0701.gif
+share/swat/using_samba/figs/sam.0702.gif
+share/swat/using_samba/figs/sam.0703.gif
+share/swat/using_samba/figs/sam.0704.gif
+share/swat/using_samba/figs/sam.0705.gif
+share/swat/using_samba/figs/sam.0706.gif
+share/swat/using_samba/figs/sam.0707.gif
+share/swat/using_samba/figs/sam.0708.gif
+share/swat/using_samba/figs/sam.0709.gif
+share/swat/using_samba/figs/sam.0801.gif
+share/swat/using_samba/figs/sam.0802.gif
+share/swat/using_samba/figs/sam.0803.gif
+share/swat/using_samba/figs/sam.0804.gif
+share/swat/using_samba/figs/sam.0805.gif
+share/swat/using_samba/figs/sam.0901.gif
+share/swat/using_samba/figs/sam.0902.gif
+share/swat/using_samba/figs/sam.0903.gif
+share/swat/using_samba/figs/sam.0904.gif
+share/swat/using_samba/figs/sam.0905.gif
+share/swat/using_samba/figs/sam.aa01.gif
+share/swat/using_samba/figs/sam.ab01.gif
+share/swat/using_samba/figs/sam.ab02.gif
+share/swat/using_samba/gifs/index.gif
+share/swat/using_samba/gifs/samba.s.gif
+share/swat/using_samba/gifs/txthome.gif
+share/swat/using_samba/gifs/txtnexta.gif
+share/swat/using_samba/gifs/txtpreva.gif
+share/swat/using_samba/appa_01.html
+share/swat/using_samba/appa_02.html
+share/swat/using_samba/appa_03.html
+share/swat/using_samba/appa_04.html
+share/swat/using_samba/appa_05.html
+share/swat/using_samba/appb_01.html
+share/swat/using_samba/appb_02.html
+share/swat/using_samba/appb_03.html
+share/swat/using_samba/appc_01.html
+share/swat/using_samba/appd_01.html
+share/swat/using_samba/appe_01.html
+share/swat/using_samba/appf_01.html
+share/swat/using_samba/ch01_01.html
+share/swat/using_samba/ch01_02.html
+share/swat/using_samba/ch01_03.html
+share/swat/using_samba/ch01_04.html
+share/swat/using_samba/ch01_05.html
+share/swat/using_samba/ch01_06.html
+share/swat/using_samba/ch01_07.html
+share/swat/using_samba/ch01_08.html
+share/swat/using_samba/ch02_01.html
+share/swat/using_samba/ch02_02.html
+share/swat/using_samba/ch02_03.html
+share/swat/using_samba/ch02_04.html
+share/swat/using_samba/ch02_05.html
+share/swat/using_samba/ch02_06.html
+share/swat/using_samba/ch03_01.html
+share/swat/using_samba/ch03_02.html
+share/swat/using_samba/ch03_03.html
+share/swat/using_samba/ch04_01.html
+share/swat/using_samba/ch04_02.html
+share/swat/using_samba/ch04_03.html
+share/swat/using_samba/ch04_04.html
+share/swat/using_samba/ch04_05.html
+share/swat/using_samba/ch04_06.html
+share/swat/using_samba/ch04_07.html
+share/swat/using_samba/ch04_08.html
+share/swat/using_samba/ch05_01.html
+share/swat/using_samba/ch05_02.html
+share/swat/using_samba/ch05_03.html
+share/swat/using_samba/ch05_04.html
+share/swat/using_samba/ch05_05.html
+share/swat/using_samba/ch06_01.html
+share/swat/using_samba/ch06_02.html
+share/swat/using_samba/ch06_03.html
+share/swat/using_samba/ch06_04.html
+share/swat/using_samba/ch06_05.html
+share/swat/using_samba/ch06_06.html
+share/swat/using_samba/ch07_01.html
+share/swat/using_samba/ch07_02.html
+share/swat/using_samba/ch07_03.html
+share/swat/using_samba/ch08_01.html
+share/swat/using_samba/ch08_02.html
+share/swat/using_samba/ch08_03.html
+share/swat/using_samba/ch08_04.html
+share/swat/using_samba/ch08_05.html
+share/swat/using_samba/ch08_06.html
+share/swat/using_samba/ch08_07.html
+share/swat/using_samba/ch09_01.html
+share/swat/using_samba/ch09_02.html
+share/swat/using_samba/ch09_03.html
+share/swat/using_samba/index.html
+share/swat/using_samba/inx.html
+share/swat/using_samba/licenseinfo.html
+share/swat/using_samba/this_edition.html
 share/swat/help/welcome.html
 share/swat/help/DOMAIN_MEMBER.html
+share/swat/help/ENCRYPTION.html
 share/swat/help/NT_Security.html
+share/swat/help/OS2-Client-HOWTO.html
 share/swat/help/Samba-HOWTO-Collection.html
+share/swat/help/Samba-PDC-HOWTO.html
 share/swat/help/UNIX_INSTALL.html
 share/swat/help/findsmb.1.html
 share/swat/help/lmhosts.5.html
@@ -288,4 +451,7 @@ share/swat/include/header.html
 @dirrm share/swat/images
 @dirrm share/swat/include
 @dirrm share/swat/help
+@dirrm share/swat/using_samba/figs
+@dirrm share/swat/using_samba/gifs
+@dirrm share/swat/using_samba
 @dirrm share/swat