7 files changed, 20 insertions, 101 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 868fd2fdc724..06e0ce20d0e7 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.2.3a
+PORTVERSION=	2.2.4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
@@ -17,10 +17,7 @@ MASTER_SITE_SUBDIR=	. old-versions old
 
 MAINTAINER=	dwcjr@FreeBSD.org
 
-.if defined(WITH_RECYCLE)
-PATCH_SITES+=	http://www.amherst.edu/~bbstone/recycle_bin/2.2.3/
-PATCHFILES+=	proto.h.patch loadparm.c.patch reply.c.patch
-.endif
+USE_BZIP2=	YES
 
 # directories
 VARDIR=		/var
@@ -37,7 +34,8 @@ CONFIGURE_ARGS=	--libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
 		--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE} \
-		--with-pam
+		--with-pam --with-piddir=${VARDIR}/run \
+		--with-logfilebase
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 589facd00901..29042e1c9242 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,4 +1 @@
-MD5 (samba-2.2.3a.tar.gz) = b6ec2f076af69331535a82b586f55254
-MD5 (proto.h.patch) = 2a0fee801c71543c9956c2f8c6b108cc
-MD5 (loadparm.c.patch) = 11b8c90081226e6084e7b97ba1806752
-MD5 (reply.c.patch) = f2535eca7b6cc02396227d2821f8d73f
+MD5 (samba-2.2.4.tar.bz2) = 28b4b75bb34d7d021e0dc2546ec68c7a
diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa
index b0024a08bcfa..dfd076d598a6 100644
--- a/net/samba/files/patch-aa
+++ b/net/samba/files/patch-aa
@@ -1,11 +1,6 @@
---- Makefile.in.orig	Sat Oct 13 22:09:06 2001
-+++ Makefile.in	Tue Oct 16 17:15:15 2001
-@@ -46,11 +46,11 @@
- # 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))
--LOGFILEBASE = @logfilebase@
-+LOGFILEBASE = $(VARDIR)/log
+--- Makefile.in.orig	Thu May  2 20:02:26 2002
++++ Makefile.in	Fri May  3 10:04:22 2002
+@@ -51,7 +51,7 @@
  CONFIGFILE = $(CONFIGDIR)/smb.conf
  LMHOSTSFILE = $(CONFIGDIR)/lmhosts
  DRIVERFILE = $(CONFIGDIR)/printers.def
@@ -14,22 +9,12 @@
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -63,6 +63,9 @@
- # the directory where lock files go
- LOCKDIR = @lockdir@
- 
-+# the directory where pid files go
-+PIDFILEDIR = $(VARDIR)/run
-+
- # libsmbclient support here
- BLDSHARED = @BLDSHARED@
- LIBSMBCLIENT_MAJOR=0
-@@ -78,7 +81,7 @@
+@@ -82,7 +82,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)\"
+ FLAGS1 = $(CFLAGS) @FLAGS1@ -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)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
-+FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" 
++FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\"  -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
+ FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DLIBDIR=\"$(LIBDIR)\"
  FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
  FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba/files/patch-ab b/net/samba/files/patch-ab
deleted file mode 100644
index b1383c6ae2e3..000000000000
--- a/net/samba/files/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
---- param/loadparm.c.orig	Sat Oct 13 22:09:31 2001
-+++ param/loadparm.c	Tue Oct 16 17:16:46 2001
-@@ -107,6 +107,7 @@
- 	char *szDeletePrinterCommand;
- 	char *szOs2DriverMap;
- 	char *szLockDir;
-+	char *szPidDir;
- 	char *szRootdir;
- 	char *szDefaultService;
- 	char *szDfree;
-@@ -986,6 +987,8 @@
- 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
- 	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, 
- 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
-+	{"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
-+	{"pidfile directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
- #ifdef WITH_UTMP
- 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
- 	{"wtmp directory", P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0},
-@@ -1220,6 +1223,7 @@
- 	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
- 	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
- 	string_set(&Globals.szLockDir, LOCKDIR);
-+	string_set(&Globals.szPidDir, PIDFILEDIR);
- #ifdef WITH_UTMP
- 	string_set(&Globals.szUtmpDir, "");
- 	string_set(&Globals.szWtmpDir, "");
-@@ -1469,6 +1473,7 @@
- FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
- FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
- FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
-+FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
- #ifdef WITH_UTMP
- FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
- FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)
diff --git a/net/samba/files/patch-ac b/net/samba/files/patch-ac
deleted file mode 100644
index 8fbd726ae435..000000000000
--- a/net/samba/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/pidfile.c.orig	Sat Oct 13 22:09:24 2001
-+++ lib/pidfile.c	Tue Oct 16 17:17:51 2001
-@@ -39,7 +39,7 @@
- 	unsigned ret;
- 	pstring pidFile;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	fd = sys_open(pidFile, O_NONBLOCK | O_RDONLY, 0644);
- 	if (fd == -1) {
-@@ -80,7 +80,7 @@
- 	pstring pidFile;
- 	pid_t pid;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	pid = pidfile_pid(name);
- 	if (pid != 0) {
diff --git a/net/samba/files/patch-bb b/net/samba/files/patch-bb
deleted file mode 100644
index 5b14f2131b03..000000000000
--- a/net/samba/files/patch-bb
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/proto.h.orig	Sat Oct 13 22:09:22 2001
-+++ include/proto.h	Tue Oct 16 17:21:53 2001
-@@ -1733,6 +1733,7 @@
- char *lp_deleteprinter_cmd(void);
- char *lp_os2_driver_map(void);
- char *lp_lockdir(void);
-+char *lp_piddir(void);
- char *lp_utmpdir(void);
- char *lp_wtmpdir(void);
- BOOL lp_utmp(void);
diff --git a/net/samba/pkg-plist b/net/samba/pkg-plist
index bc0a889aafd2..73920b98c4be 100644
--- a/net/samba/pkg-plist
+++ b/net/samba/pkg-plist
@@ -71,6 +71,7 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/THANKS
 %%PORTDOCS%%share/doc/samba/WHATSNEW.txt
 %%PORTDOCS%%share/doc/samba/announce
+%%PORTDOCS%%share/doc/samba/faq/README
 %%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-1.html
 %%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-2.html
 %%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ.html
@@ -163,6 +164,7 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/textdocs/SCO.txt
 %%PORTDOCS%%share/doc/samba/textdocs/SMBTAR.notes
 %%PORTDOCS%%share/doc/samba/textdocs/Samba-OpenSSL.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Solaris-Winbind-HOWTO.txt                  
 %%PORTDOCS%%share/doc/samba/textdocs/Speed.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Speed2.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Tracing.txt
@@ -171,9 +173,6 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/textdocs/Win95.txt
 %%PORTDOCS%%share/doc/samba/textdocs/WinNT.txt
 %%PORTDOCS%%share/doc/samba/textdocs/cifsntdomain.txt
-%%PORTDOCS%%share/doc/samba/textdocs/kurs.pdf
-%%PORTDOCS%%share/doc/samba/textdocs/kurs.tex
-%%PORTDOCS%%share/doc/samba/textdocs/logo.ps
 %%PORTDOCS%%share/doc/samba/textdocs/security_level.txt
 share/examples/samba/LDAP/README
 share/examples/samba/LDAP/export2_smbpasswd.pl
@@ -183,6 +182,9 @@ share/examples/samba/LDAP/import_smbpasswd.pl
 share/examples/samba/LDAP/ldapchpasswd
 share/examples/samba/LDAP/ldapsync.pl
 share/examples/samba/LDAP/samba.schema
+share/examples/samba/LDAP/samba-schema-netscapeds4.x
+share/examples/samba/LDAP/samba-schema-netscapeds5.x
+share/examples/samba/LDAP/samba-schema.IBMSecureWay
 share/examples/samba/README
 share/examples/samba/VFS/.cvsignore
 share/examples/samba/VFS/Makefile
@@ -192,6 +194,7 @@ share/examples/samba/VFS/block/block.c
 share/examples/samba/VFS/block/samba-block.conf
 share/examples/samba/VFS/block/smb.conf
 share/examples/samba/VFS/audit.c
+share/examples/samba/VFS/recycle.c
 share/examples/samba/VFS/skel.c
 share/examples/samba/appliance/Makefile
 share/examples/samba/appliance/README
@@ -216,7 +219,8 @@ share/examples/samba/printer-accounting/printcap
 share/examples/samba/printing/smbprint
 share/examples/samba/printing/smbprint.newer
 share/examples/samba/printing/smbprint.sysv
-share/examples/samba/printing/smbprint-new.sh
+share/examples/samba/printing/smbprint.old
+share/examples/samba/printing/smbprint.safer
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
 share/examples/samba/smb.conf.default