Upgrade to samba 2.0.2. While I'm these clean up a few things:

- use configure arguments instead of make variables for some path, and
  Makefile.in patch
- move smb.conf.sample to share/examples/

4 files changed, 21 insertions, 32 deletions

diff --git a/net/samba2/Makefile b/net/samba2/Makefile
index 4113345b754..76141ea2771 100644
--- a/net/samba2/Makefile
+++ b/net/samba2/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.6 1999/01/29 10:40:03 bouyer Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/11 17:11:33 bouyer Exp $
 
-DISTNAME=	samba-2.0.0
+DISTNAME=	samba-2.0.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/
 
 MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://www.samba.org/
 
-CONFLICTS=      samba-1.* samba-2.0.0beta* 
+CONFLICTS=      samba-1.* samba-2.0.0beta* samba-2.0.0
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 GNU_CONFIGURE=	yes
@@ -15,14 +15,18 @@ GNU_CONFIGURE=	yes
 .include "../../mk/bsd.prefs.mk"
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
-SAMPLE_CONFIG=	${PREFIX}/etc/smb.conf.sample
+SAMPLE_CONFIG=	${PREFIX}/share/examples/smb.conf.sample
 SAMBA_LOGDIR=	/var/log
 SAMBA_LOCKDIR=	/var/run/samba
 SAMBA_ETCDIR?=	/etc/samba
 SAMBA_PRIVATE?=	${SAMBA_ETCDIR}/private
 
-MAKE_ENV+=	ETCDIR=${SAMBA_ETCDIR} PRIVATEDIR=${SAMBA_PRIVATE}
-MAKE_ENV+=	LOGDIR=${SAMBA_LOGDIR} LOCKDIR=${SAMBA_LOCKDIR}
+MAKE_ENV+=	ETCDIR=${SAMBA_ETCDIR}
+MAKE_ENV+=	LOGDIR=${SAMBA_LOGDIR}
+
+CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/swat \
+	--with-lockdir=${SAMBA_LOCKDIR} \
+	--with-privatedir=${SAMBA_PRIVATE}
 
 PLIST_SRC= ${WRKDIR}/.PLIST-src
 
diff --git a/net/samba2/files/md5 b/net/samba2/files/md5
index 2162ec605ad..f2cb10d0063 100644
--- a/net/samba2/files/md5
+++ b/net/samba2/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/01/21 15:07:59 bouyer Exp $
+$NetBSD: md5,v 1.5 1999/02/11 17:11:33 bouyer Exp $
 
-MD5 (samba-2.0.0.tar.gz) = fb4477a7967a2df752a2a94a493fbe51
+MD5 (samba-2.0.2.tar.gz) = 67a3e3765570aa35ed6cc8fa0e819aad
diff --git a/net/samba2/patches/patch-aa b/net/samba2/patches/patch-aa
index 214c9464d21..87c0c54037e 100644
--- a/net/samba2/patches/patch-aa
+++ b/net/samba2/patches/patch-aa
@@ -1,7 +1,6 @@
-$NetBSD: patch-aa,v 1.3 1999/02/10 15:16:57 frueauf Exp $
-
---- Makefile.in.orig	Mon Dec  7 22:50:26 1998
-+++ Makefile.in	Fri Dec 11 12:38:09 1998
+$NetBSD: patch-aa,v 1.4 1999/02/11 17:11:33 bouyer Exp $
+--- Makefile.in.orig	Sat Feb  6 22:51:43 1999
++++ Makefile.in	Thu Feb 11 14:29:47 1999
 @@ -23,12 +23,11 @@
  
  BASEDIR= @prefix@
@@ -18,7 +17,7 @@ $NetBSD: patch-aa,v 1.3 1999/02/10 15:16:57 frueauf Exp $
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
-@@ -36,23 +35,23 @@
+@@ -36,12 +35,12 @@
  # 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))
@@ -35,23 +34,9 @@ $NetBSD: patch-aa,v 1.3 1999/02/10 15:16:57 frueauf Exp $
 +DRIVERFILE = $(ETCDIR)/printers.def
 +PASSWD_PROGRAM = /usr/bin/passwd
  # This is where smbpasswd et al go
--PRIVATEDIR = @privatedir@
-+PRIVATEDIR?= @privatedir@
+ PRIVATEDIR = @privatedir@
  
- SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
- SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp
- 
- # This is where SWAT images and help files go
--SWATDIR = @swatdir@
-+SWATDIR = $(BASEDIR)/share/swat
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR?= $(VARDIR)/locks
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -426,8 +425,8 @@
+@@ -430,8 +429,8 @@
  	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
  
  installbin: all installdirs
@@ -62,7 +47,7 @@ $NetBSD: patch-aa,v 1.3 1999/02/10 15:16:57 frueauf Exp $
  
  installscripts: installdirs
  	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -452,8 +451,8 @@
+@@ -456,8 +455,8 @@
  	@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
  
  uninstallbin:
diff --git a/net/samba2/pkg/PLIST b/net/samba2/pkg/PLIST
index 5fd3b4930d4..f08ffc04cf8 100644
--- a/net/samba2/pkg/PLIST
+++ b/net/samba2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/01/09 20:49:27 kleink Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/02/11 17:11:34 bouyer Exp $
 bin/mksmbpasswd.sh
 bin/addtosmbpass
 bin/convert_smbpasswd
@@ -143,7 +143,7 @@ share/doc/samba/NT4_PlainPassword.reg
 share/doc/samba/Win95_PlainPassword.reg
 share/doc/samba/THANKS
 etc/rc.d/samba.sh.sample
-etc/smb.conf.sample
+share/examples/smb.conf.sample
 @dirrm share/doc/samba/faq
 @dirrm share/doc/samba/textdocs
 @dirrm share/doc/samba