Update to 2.0 beta3

4 files changed, 37 insertions, 21 deletions

diff --git a/net/samba2/Makefile b/net/samba2/Makefile
index 8916793b3a2..88e0bda1980 100644
--- a/net/samba2/Makefile
+++ b/net/samba2/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/27 12:48:26 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 1998/12/11 12:05:44 bouyer Exp $
 
-DISTNAME=	samba-2.0.0beta2
+DISTNAME=	samba-2.0.0beta3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/beta/
 
 MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://www.samba.org/
 
-CONFLICTS=      samba-1.9.18p8 samba-1.9.18p10
+CONFLICTS=      samba-1.9.18p8 samba-1.9.18p10 samba-2.0.0beta2
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 GNU_CONFIGURE=	yes
@@ -21,7 +21,7 @@ SAMBA_LOCKDIR=	/var/run/samba
 SAMBA_ETCDIR?=	/etc/samba
 SAMBA_PRIVATE?=	${SAMBA_ETCDIR}/private
 
-MAKE_ENV+=	ETCDIR=${SAMBA_ETCDIR} PRIVDIR=${SAMBA_PRIVATE}
+MAKE_ENV+=	ETCDIR=${SAMBA_ETCDIR} PRIVATEDIR=${SAMBA_PRIVATE}
 MAKE_ENV+=	LOGDIR=${SAMBA_LOGDIR} LOCKDIR=${SAMBA_LOCKDIR}
 
 PLIST_SRC= ${WRKDIR}/.PLIST-src
diff --git a/net/samba2/files/md5 b/net/samba2/files/md5
index 24feb12f09a..9d19a466ae6 100644
--- a/net/samba2/files/md5
+++ b/net/samba2/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1998/11/27 12:48:26 bouyer Exp $
+$NetBSD: md5,v 1.2 1998/12/11 12:05:44 bouyer Exp $
 
-MD5 (samba-2.0.0beta2.tar.gz) = 736a1a33ca323b464442e108515dbc24
+MD5 (samba-2.0.0beta3.tar.gz) = 2a15f50d443ca9d9832d7cb1a0e2016e
diff --git a/net/samba2/patches/patch-aa b/net/samba2/patches/patch-aa
index 7bedd73c331..175b37ae01a 100644
--- a/net/samba2/patches/patch-aa
+++ b/net/samba2/patches/patch-aa
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/11/27 12:48:27 bouyer Exp $
-
---- Makefile.in.orig	Sat Nov 21 02:53:05 1998
-+++ Makefile.in	Fri Nov 27 00:29:07 1998
-@@ -23,12 +23,12 @@
+--- Makefile.in.orig	Mon Dec  7 22:50:26 1998
++++ Makefile.in	Fri Dec 11 12:38:09 1998
+@@ -23,12 +23,11 @@
  
  BASEDIR= @prefix@
  BINDIR = @bindir@
@@ -11,15 +9,14 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/11/27 12:48:27 bouyer Exp $
 -SBINDIR = @bindir@
 +SBINDIR = @sbindir@
  LIBDIR = @libdir@
--VARDIR = $(BASEDIR)/var
+-VARDIR = @localstatedir@
  MANDIR = @mandir@
 +ETCDIR?= $(BASEDIR)/etc
 +LOGDIR?= $(BASEDIR)/log
-+PRIVDIR?= $(BASEDIR)/private
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
-@@ -36,20 +36,20 @@
+@@ -36,23 +35,23 @@
  # 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))
@@ -29,18 +26,21 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/11/27 12:48:27 bouyer Exp $
 -LMHOSTSFILE = $(LIBDIR)/lmhosts
 -DRIVERFILE = $(LIBDIR)/printers.def
 -PASSWD_PROGRAM = /bin/passwd
--SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
 +SMBLOGFILE = $(LOGDIR)/log.smb
 +NMBLOGFILE = $(LOGDIR)/log.nmb
 +CONFIGFILE = $(ETCDIR)/smb.conf
 +LMHOSTSFILE = $(ETCDIR)/lmhosts
 +DRIVERFILE = $(ETCDIR)/printers.def
 +PASSWD_PROGRAM = /usr/bin/passwd
-+SMB_PASSWD_FILE = $(PRIVDIR)/smbpasswd
- SMB_PASSWD_PROGRAM = $(BINDIR)/smbpasswd
+ # This is where smbpasswd et al go
+-PRIVATEDIR = @privatedir@
++PRIVATEDIR?= @privatedir@
+ 
+ SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
+ SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp
  
  # This is where SWAT images and help files go
--SWATDIR = $(BASEDIR)/swat
+-SWATDIR = @swatdir@
 +SWATDIR = $(BASEDIR)/share/swat
  
  # the directory where lock files go
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/11/27 12:48:27 bouyer Exp $
  
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -423,8 +423,8 @@
+@@ -426,8 +425,8 @@
  	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
  
  installbin: all installdirs
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/11/27 12:48:27 bouyer Exp $
  
  installscripts: installdirs
  	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -449,8 +449,8 @@
+@@ -452,8 +451,8 @@
  	@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
  
  uninstallbin:
diff --git a/net/samba2/pkg/PLIST b/net/samba2/pkg/PLIST
index 7affb1d0014..06c52c9480f 100644
--- a/net/samba2/pkg/PLIST
+++ b/net/samba2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/11/27 12:48:27 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/12/11 12:05:44 bouyer Exp $
 bin/mksmbpasswd.sh
 bin/addtosmbpass
 bin/convert_smbpasswd
@@ -42,7 +42,23 @@ man/man8/smbmount.8
 man/man8/smbpasswd.8
 man/man8/smbumount.8
 man/man8/swat.8
+share/swat/help/DOMAIN_MEMBER.html
+share/swat/help/lmhosts.5.html
+share/swat/help/make_smbcodepage.1.html
+share/swat/help/nmbd.8.html
+share/swat/help/nmblookup.1.html
+share/swat/help/samba.7.html
 share/swat/help/smb.conf.5.html
+share/swat/help/smbclient.1.html
+share/swat/help/smbd.8.html
+share/swat/help/smbpasswd.5.html
+share/swat/help/smbpasswd.8.html
+share/swat/help/smbrun.1.html
+share/swat/help/smbstatus.1.html
+share/swat/help/smbtar.1.html
+share/swat/help/swat.8.html
+share/swat/help/testparm.1.html
+share/swat/help/testprns.1.html
 share/swat/help/welcome.html
 share/swat/images/globals.gif
 share/swat/images/home.gif