Update net/samba to version 2.2.5. The quick summary of changes from

version 2.2.4nb1 is that there are the usual minor bug fixes, plus some
important ones:

        * fix printing with Win2K/XP clients
        * fixes related to using LDAP for the SAM
        * fixes related to changing passwords

Pkgsrc changes:

	* Fetch the .tar.bz2 file -- it's smaller.
	* Use smb.conf.default as the sample config file and get rid of
	  the homegrown files/smb.conf.sample.  smb.conf.default is more
	  informative and is a better resource.
	* Remove irrelevant examples.
	* Move convert_smbpasswd script to the examples/samba/misc
	  directory.  It's pretty much outlived it's usefulness at this
	  point of the Samba release cycle.

10 files changed, 81 insertions, 404 deletions

diff --git a/net/samba/MESSAGE.smbpasswd b/net/samba/MESSAGE.smbpasswd
index 7bc088440c1..795a34371b9 100644
--- a/net/samba/MESSAGE.smbpasswd
+++ b/net/samba/MESSAGE.smbpasswd
@@ -1,17 +1,19 @@
 ===========================================================================
-$NetBSD: MESSAGE.smbpasswd,v 1.1 2002/02/05 05:14:46 jlam Exp $
+$NetBSD: MESSAGE.smbpasswd,v 1.2 2002/06/22 21:31:29 jlam Exp $
 
-                    *===* SECURITY NOTES *===*
+                      *===* SECURITY NOTES *===*
 
-The users' encrypted passwords stored in
+The users' encrypted passwords are stored in
 
-	${SAMBA_ETCDIR}/private/smbpasswd 
+	${SAMBA_PRIVATE}/smbpasswd
 
-are _PASSWORD_EQUIVALENT_ from the viewpoint of SMB protocol.  Do not
-weaken the permissions of this file (owned by ${ROOT_USER}:${ROOT_GROUP} and with file
-mode rw-------) without any special reasons.
+with owner ${ROOT_USER}, group ${ROOT_GROUP}), and file mode 0600.
+These encrypted passwords are _PASSWORD_EQUIVALENT_ from the viewpoint of
+the SMB protocol.  Do _NOT_ weaken the permissions of this file unless
+there is a very good reason.
 
-Please note that even if you pkg_delete ${PKGNAME}, pkg_delete will
-not remove the smbpasswd file.  If you won't use this package anymore, it
-is strongly recommended that you remove the smbpasswd file manually.
+Please note that even if you pkg_delete ${PKGNAME}, the smbpasswd file
+will remain on the system.  If you don't intend to use this package
+anymore, then it is _STRONGLY_ recommended that you remove the smbpasswd
+file manually.
 ===========================================================================
diff --git a/net/samba/Makefile b/net/samba/Makefile
index ec92762d606..f6081be508c 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.83 2002/06/14 17:04:13 taca Exp $
+# $NetBSD: Makefile,v 1.84 2002/06/22 21:31:29 jlam Exp $
 
-DISTNAME=		samba-2.2.4
-PKGREVISION=		1
+DISTNAME=		samba-2.2.5
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.samba.org/pub/samba/ \
@@ -13,6 +12,7 @@ COUNTRY_MIRRORS=	au1 ca fi fr de it pl ru sg se us1 us6
 .for COUNTRY in ${COUNTRY_MIRRORS}
 MASTER_SITES+=		ftp://${COUNTRY}.samba.org/pub/samba/
 .endfor
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.samba.org/
@@ -37,15 +37,13 @@ SAMBA_LOGDIR?=		${VARDIR}/log
 SAMBA_PIDDIR?=		${VARDIR}/run
 SAMBA_PRIVATE?=		${SAMBA_ETCDIR}/private
 
-MAKE_ENV+=		ETCDIR=${SAMBA_ETCDIR}
-MAKE_ENV+=		LOGDIR=${SAMBA_LOGDIR}
-
 CONFIGURE_ARGS+=	--localstatedir=${VARDIR}
 CONFIGURE_ARGS+=	--sbindir=${PREFIX}/sbin
 CONFIGURE_ARGS+=	--with-configdir=${SAMBA_ETCDIR}
 CONFIGURE_ARGS+=	--with-codepagedir=${SAMBA_DATADIR}/samba/codepages
 CONFIGURE_ARGS+=	--with-datadir=${SAMBA_DATADIR}
 CONFIGURE_ARGS+=	--with-lockdir=${SAMBA_LOCKDIR}
+CONFIGURE_ARGS+=	--with-logfilebase=${SAMBA_LOGDIR}
 CONFIGURE_ARGS+=	--with-piddir=${SAMBA_PIDDIR}
 CONFIGURE_ARGS+=	--with-privatedir=${SAMBA_PRIVATE}
 CONFIGURE_ARGS+=	--with-swatdir=${SAMBA_DATADIR}/samba/swat
@@ -60,6 +58,9 @@ CONFIGURE_ENV+=		ac_cv_lib_curses_tgetent=no
 .if defined(USE_CUPS) && (${USE_CUPS} == "YES")
 .include "../../print/cups/buildlink.mk"
 BUILD_DEFS+=		USE_CUPS
+CONFIGURE_ARGS+=	--enable-cups
+.else
+CONFIGURE_ARGS+=	--disable-cups
 .endif
 
 .if defined(USE_PAM)
@@ -77,13 +78,16 @@ PLIST_SUBST+=		SAMBA_LDAP=""
 PLIST_SUBST+=		SAMBA_LDAP="@comment "
 MESSAGE_SRC=		${.CURDIR}/MESSAGE.smbpasswd
 SMBPASSWD_FILE=		/dev/null ${SAMBA_PRIVATE}/smbpasswd		\
-			${ROOT_USER} ${ROOT_GROUP} 0700
+			${ROOT_USER} ${ROOT_GROUP} 0600
 .endif
 
 # The following are Linux-only options.
 CONFIGURE_ARGS+=	--without-smbwrapper
 CONFIGURE_ARGS+=	--without-smbmount
 
+# Explicitly disable winbind until it may be properly handled by pkgsrc.
+CONFIGURE_ARGS+=	--without-winbind
+
 DOCDIR=			${PREFIX}/share/doc/samba
 HTMLDIR=		${PREFIX}/share/doc/html/samba
 EXAMPLESDIR=		${PREFIX}/share/examples/samba
@@ -92,11 +96,11 @@ FILES_SUBST=		SAMBA_PRIVATE=${SAMBA_PRIVATE}
 FILES_SUBST+=		SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
 FILES_SUBST+=		SAMBA_LOGDIR=${SAMBA_LOGDIR}
 FILES_SUBST+=		SAMBA_ETCDIR=${SAMBA_ETCDIR}
-MESSAGE_SUBST+=		SAMBA_ETCDIR=${SAMBA_ETCDIR}
+MESSAGE_SUBST+=		SAMBA_PRIVATE=${SAMBA_PRIVATE}
 MESSAGE_SUBST+=		ROOT_GROUP=${ROOT_GROUP}
 MESSAGE_SUBST+=		ROOT_USER=${ROOT_USER}
 
-CONF_FILES=		${EXAMPLESDIR}/smb.conf.sample ${SAMBA_ETCDIR}/smb.conf
+CONF_FILES=		${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
 SUPPORT_FILES_PERMS=	${SMBPASSWD_FILE}
 RCD_SCRIPTS=		samba nmbd smbd
 OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
@@ -104,10 +108,17 @@ OWN_DIRS_PERMS=		${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
 
 INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 
+# Remove irrelevant files for this package.
 post-extract:
 	${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print |	\
 		${XARGS} ${RM} -f
 	${RM} -r ${WRKDIR}/${DISTNAME}/docs/textdocs/outdated
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/VFS
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/appliance
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/autofs
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/dce-dfs
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/libsmbclient
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/svr4-startup
 
 pre-install:
 	@for script in ${RCD_SCRIPTS}; do				\
@@ -133,15 +144,13 @@ post-install:
 		${INSTALL_SCRIPT} ${WRKDIR}/$${script}			\
 			${PREFIX}/etc/rc.d/$${script};			\
 	done
-	${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd		\
+		${EXAMPLESDIR}/misc
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh		\
 		${PREFIX}/sbin/mksmbpasswd
 
-	@${SED} ${FILES_SUBST_SED}					\
-		${FILESDIR}/smb.conf.sample > ${WRKDIR}/smb.conf.sample
-	${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${EXAMPLESDIR}
-
 .include "../../devel/readline/buildlink.mk"
 .include "../../security/openssl/buildlink.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 885442d5813..f79d330bbf6 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2002/05/05 16:57:11 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/06/22 21:31:30 jlam Exp $
+bin/findsmb
 bin/make_printerdef
 bin/make_smbcodepage
 bin/make_unicodemap
@@ -46,7 +47,6 @@ man/man8/smbspool.8
 man/man8/smbumount.8
 man/man8/swat.8
 man/man8/winbindd.8
-sbin/convert_smbpasswd
 sbin/mksmbpasswd
 sbin/nmbd
 sbin/smbd
@@ -95,7 +95,6 @@ share/doc/samba/RoutedNetworks.txt
 share/doc/samba/SCO.txt
 share/doc/samba/SMBTAR.notes
 share/doc/samba/Samba-OpenSSL.txt
-share/doc/samba/Solaris-Winbind-HOWTO.txt
 share/doc/samba/Speed.txt
 share/doc/samba/Speed2.txt
 share/doc/samba/Tracing.txt
@@ -114,9 +113,7 @@ share/doc/samba/announce
 share/doc/samba/cifsntdomain.txt
 share/doc/samba/security_level.txt
 share/examples/samba/LDAP/README
-share/examples/samba/LDAP/export2_smbpasswd.pl
 share/examples/samba/LDAP/export_smbpasswd.pl
-share/examples/samba/LDAP/import2_smbpasswd.pl
 share/examples/samba/LDAP/import_smbpasswd.pl
 share/examples/samba/LDAP/ldapchpasswd
 share/examples/samba/LDAP/ldapsync.pl
@@ -124,26 +121,43 @@ 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/LDAP/samba.schema
+share/examples/samba/LDAP/smbldap-tools/AUTHORS
+share/examples/samba/LDAP/smbldap-tools/CONTRIBUTORS
+share/examples/samba/LDAP/smbldap-tools/COPYING
+share/examples/samba/LDAP/smbldap-tools/ChangeLog
+share/examples/samba/LDAP/smbldap-tools/FILES
+share/examples/samba/LDAP/smbldap-tools/INFRASTRUCTURE
+share/examples/samba/LDAP/smbldap-tools/INSTALL
+share/examples/samba/LDAP/smbldap-tools/Makefile
+share/examples/samba/LDAP/smbldap-tools/NEWS
+share/examples/samba/LDAP/smbldap-tools/README
+share/examples/samba/LDAP/smbldap-tools/TODO
+share/examples/samba/LDAP/smbldap-tools/cgi/README
+share/examples/samba/LDAP/smbldap-tools/cgi/ldappass.cgi
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/Makefile
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.h
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/md4.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.c
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.h
+share/examples/samba/LDAP/smbldap-tools/mkntpwd/smbdes.c
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupadd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupdel.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupmod.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-groupshow.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-accounts.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-groups.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-passwd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-populate.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-tools.spec
+share/examples/samba/LDAP/smbldap-tools/smbldap-useradd.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-userdel.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-usermod.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap-usershow.pl
+share/examples/samba/LDAP/smbldap-tools/smbldap_conf.pm
+share/examples/samba/LDAP/smbldap-tools/smbldap_tools.pm
 share/examples/samba/README
-share/examples/samba/VFS/Makefile
-share/examples/samba/VFS/README
-share/examples/samba/VFS/audit.c
-share/examples/samba/VFS/block/Makefile
-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/recycle.c
-share/examples/samba/VFS/skel.c
-share/examples/samba/appliance/Makefile
-share/examples/samba/appliance/README
-share/examples/samba/appliance/appliance.spec
-share/examples/samba/appliance/build.sh
-share/examples/samba/appliance/smb.conf-appliance
-share/examples/samba/autofs/auto.a
-share/examples/samba/dce-dfs/README
-share/examples/samba/dce-dfs/smb.conf
-share/examples/samba/libsmbclient/testsmbc.c
-share/examples/samba/libsmbclient/tree.c
+share/examples/samba/misc/convert_smbpasswd
 share/examples/samba/misc/extra_smbstatus
 share/examples/samba/misc/modify_samba_config.pl
 share/examples/samba/misc/swat.pl
@@ -162,9 +176,6 @@ share/examples/samba/printing/smbprint.sysv
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
 share/examples/samba/smb.conf.default
-share/examples/samba/smb.conf.sample
-share/examples/samba/svr4-startup/README
-share/examples/samba/svr4-startup/samba.server
 share/examples/samba/thoralf/smb.conf
 share/examples/samba/tridge/README
 share/examples/samba/tridge/smb.conf
@@ -223,6 +234,7 @@ share/samba/swat/help/Samba-HOWTO-Collection.html
 share/samba/swat/help/Samba-LDAP-HOWTO.html
 share/samba/swat/help/Samba-PDC-HOWTO.html
 share/samba/swat/help/UNIX_INSTALL.html
+share/samba/swat/help/cups.html
 share/samba/swat/help/findsmb.1.html
 share/samba/swat/help/lmhosts.5.html
 share/samba/swat/help/make_smbcodepage.1.html
@@ -426,7 +438,11 @@ share/samba/swat/using_samba/licenseinfo.html
 share/samba/swat/using_samba/this_edition.html
 @dirrm share/doc/html/samba
 @dirrm share/doc/samba
+@dirrm share/examples/samba/LDAP/smbldap-tools/mkntpwd
+@dirrm share/examples/samba/LDAP/smbldap-tools/cgi
+@dirrm share/examples/samba/LDAP/smbldap-tools
 @dirrm share/examples/samba/LDAP
+@dirrm share/examples/samba/VFS/recycle
 @dirrm share/examples/samba/VFS/block
 @dirrm share/examples/samba/VFS
 @dirrm share/examples/samba/appliance
diff --git a/net/samba/distinfo b/net/samba/distinfo
index a7e0713bda4..26a35a82c02 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.18 2002/06/14 17:04:13 taca Exp $
+$NetBSD: distinfo,v 1.19 2002/06/22 21:31:30 jlam Exp $
 
-SHA1 (samba-2.2.4.tar.gz) = 0c2613e709f6f89e7986d7a7324263498e5b7d8c
-Size (samba-2.2.4.tar.gz) = 5205845 bytes
-SHA1 (patch-aa) = 8edea648581741845067097a3f82c973cd89a846
-SHA1 (patch-ab) = f2b84b6764cb960dcebd34df83c1b395021bf07a
+SHA1 (samba-2.2.5.tar.bz2) = 67e1025a8d01ba51b8cea6f04176fdbc57b7c012
+Size (samba-2.2.5.tar.bz2) = 4343641 bytes
 SHA1 (patch-ac) = a055bcc69e1a40124ada075ac836d1061ecfcd15
 SHA1 (patch-ag) = 256a7e1edb961985398a94c0b738fd96fe781f9c
 SHA1 (patch-ah) = e87f2e393db68acc7028fe20d4772455379ad7aa
-SHA1 (patch-ai) = cc31eb9cfb2ee650400c18ceaaa9ec1a3626260f
 SHA1 (patch-aj) = e2c5f7580a8c701b6bf35d0d3004f714f2c810cb
-SHA1 (patch-ak) = a6f5c68e47f2251f8d697de14f4252c4c5f52f62
 SHA1 (patch-al) = 368c7f88c5538fcaa32d7263ba98d138ba179859
-SHA1 (patch-am) = 280d7111b8746ec76ce351a8a8bb712d5e16a65e
diff --git a/net/samba/files/smb.conf.sample b/net/samba/files/smb.conf.sample
deleted file mode 100644
index 1704527445f..00000000000
--- a/net/samba/files/smb.conf.sample
+++ /dev/null
@@ -1,258 +0,0 @@
-# $NetBSD: smb.conf.sample,v 1.7 2001/05/14 18:56:16 jlam Exp $
-#
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentry and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not many any basic syntactic errors. 
-#
-#======================= Global Settings =====================================
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
-   workgroup = MYGROUP
-
-# server string is the equivalent of the NT Description field
-   server string = NetBSD - Samba %v
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-;   hosts allow = 192.168.1. 192.168.2. 127.
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-   load printers = yes
-
-# you may wish to override the location of the printcap file
-;   printcap name = /etc/printcap
-
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-;   printcap name = lpstat
-
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, sysv, plp, lprng, aix, hpux, qnx
-;   printing = bsd
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-;  guest account = pcguest
-
-# this tells Samba to use a separate log file for each machine
-# that connects
-   log file = @SAMBA_LOGDIR@/log.%m
-
-# Put a capping on the size of the log files (in Kb).
-   max log size = 50
-
-# Security mode. Most people will want user level security. See
-# security_level.txt for details.
-   security = user
-
-# Use password server option only with security = server
-# The argument list may include:
-#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-#   password server = *
-;   password server = <NT-Server-Name>
-
-# Note: Do NOT use the now deprecated option of "domain controller"
-# This option is no longer implemented.
-
-# You may wish to use password encryption. Please read
-# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
-# Do not enable this option unless you have read those documents
-;  encrypt passwords = yes
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
-;   include = @SAMBA_ETCDIR@/smb.conf.%m
-
-# Most people will find that this option gives better performance.
-# See speed.txt and the manual pages for details
-# You may want to add the following on a Linux system:
-#         SO_RCVBUF=8192 SO_SNDBUF=8192
-   socket options = TCP_NODELAY 
-
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-;   interfaces = 192.168.12.2/24 192.168.13.2/24 
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-;   local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-;   os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-;   domain master = yes 
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-;   preferred master = yes
-
-# Enable this if you want Samba to be a domain logon server for 
-# Windows95 workstations. 
-;   domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-;   logon script = %m.bat
-# run a specific logon batch file per username
-;   logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-#        %L substitutes for this servers netbios name, %U is username
-#        You must uncomment the [Profiles] share below
-;   logon path = \\%L\Profiles\%U
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-#	Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one	WINS Server on the network. The default is NO.
-;   wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
-# this has been changed in version 1.9.18 to no.
-   dns proxy = no 
-
-#============================ Share Definitions ==============================
-[homes]
-   comment = Home Directories
-   browseable = no
-   writable = yes
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-;   comment = Network Logon Service
-;   path = @SAMBA_ETCDIR@/netlogon
-;   guest ok = yes
-;   writable = no
-;   share modes = no
-
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-;    path = @SAMBA_ETCDIR@/profiles
-;    browseable = no
-;    guest ok = yes
-
-
-# NOTE: If you have a BSD-style print system there is no need to 
-# specifically define each individual printer
-[printers]
-   comment = All Printers
-   path = /var/tmp
-   browseable = no
-# Set public = yes to allow user 'guest account' to print
-   guest ok = no
-   writable = no
-   printable = yes
-
-# This one is useful for people to share files
-;[tmp]
-;   comment = Temporary file space
-;   path = /tmp
-;   read only = no
-;   public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-;   comment = Public Stuff
-;   path = /home/samba
-;   public = yes
-;   writable = yes
-;   printable = no
-;   write list = @staff
-
-# Other examples. 
-#
-# A private printer, usable only by fred. Spool data will be placed in fred's
-# home directory. Note that fred must have write access to the spool directory,
-# wherever it is.
-;[fredsprn]
-;   comment = Fred's Printer
-;   valid users = fred
-;   path = /homes/fred
-;   printer = freds_printer
-;   public = no
-;   writable = no
-;   printable = yes
-
-# A private directory, usable only by fred. Note that fred requires write
-# access to the directory.
-;[fredsdir]
-;   comment = Fred's Service
-;   path = /usr/somewhere/private
-;   valid users = fred
-;   public = no
-;   writable = yes
-;   printable = no
-
-# a service which has a different directory for each machine that connects
-# this allows you to tailor configurations to incoming machines. You could
-# also use the %U option to tailor it by user name.
-# The %m gets replaced with the machine name that is connecting.
-;[pchome]
-;  comment = PC Directories
-;  path = /usr/pc/%m
-;  public = no
-;  writable = yes
-
-# A publicly accessible directory, read/write to all users. Note that all files
-# created in the directory by users will be owned by the default user, so
-# any user with access can delete any other user's files. Obviously this
-# directory must be writable by the default user. Another user could of course
-# be specified, in which case all files would be owned by that user instead.
-;[public]
-;   path = /usr/somewhere/else/public
-;   public = yes
-;   only guest = yes
-;   writable = yes
-;   printable = no
-
-# The following two entries demonstrate how to share a directory so that two
-# users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writable by both users and should have the
-# sticky bit set on it to prevent abuse. Obviously this could be extended to
-# as many users as required.
-;[myshare]
-;   comment = Mary's and Fred's stuff
-;   path = /usr/somewhere/shared
-;   valid users = mary fred
-;   public = no
-;   writable = yes
-;   printable = no
-;   create mask = 0765
-
-
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
deleted file mode 100644
index 7eab2532cfc..00000000000
--- a/net/samba/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.18 2002/05/05 16:57:11 taca Exp $
-
---- configure.in.orig	Fri May  3 10:02:46 2002
-+++ configure.in
-@@ -13,15 +13,15 @@
-     codepagedir="\$(DATADIR)/samba/codepages"
-     configdir="${sysconfdir}/samba"
-     lockdir="\${VARDIR}/cache/samba"
--    piddir="\$(VARDIR)/run/samba"
-+    piddir="\$(VARDIR)/run"
-     logfilebase="\${VARDIR}/log/samba"
-     privatedir="\${CONFIGDIR}/private"
-     swatdir="\${DATADIR}/samba/swat",
-     codepagedir="\$(LIBDIR)/codepages"
-     configdir="\$(LIBDIR)"
--    logfilebase="\$(VARDIR)"
-+    logfilebase="\$(VARDIR)/log"
-     lockdir="\${VARDIR}/locks"
--    piddir="\$(VARDIR)/locks"
-+    piddir="\$(VARDIR)/run"
-     privatedir="\${prefix}/private"
-     swatdir="\${prefix}/swat")
- 
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
deleted file mode 100644
index 7db57937c10..00000000000
--- a/net/samba/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.14 2002/05/05 16:57:12 taca Exp $
-
---- configure.orig	Fri May  3 10:02:45 2002
-+++ configure
-@@ -1017,16 +1017,16 @@
-   codepagedir="\$(DATADIR)/samba/codepages"
-     configdir="${sysconfdir}/samba"
-     lockdir="\${VARDIR}/cache/samba"
--    piddir="\$(VARDIR)/run/samba"
-+    piddir="\$(VARDIR)/run"
-     logfilebase="\${VARDIR}/log/samba"
-     privatedir="\${CONFIGDIR}/private"
-     swatdir="\${DATADIR}/samba/swat"
- else
-   codepagedir="\$(LIBDIR)/codepages"
-     configdir="\$(LIBDIR)"
--    logfilebase="\$(VARDIR)"
-+    logfilebase="\$(VARDIR)/log"
-     lockdir="\${VARDIR}/locks"
--    piddir="\$(VARDIR)/locks"
-+    piddir="\$(VARDIR)/run"
-     privatedir="\${prefix}/private"
-     swatdir="\${prefix}/swat"
- fi;
diff --git a/net/samba/patches/patch-ai b/net/samba/patches/patch-ai
deleted file mode 100644
index 3b159958dba..00000000000
--- a/net/samba/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/07/13 16:08:41 taca Exp $
-
---- script/convert_smbpasswd.orig	Thu Nov  5 11:50:17 1998
-+++ script/convert_smbpasswd
-@@ -7,7 +7,7 @@
- # with trying to work out how to get the seconds since 1970
- # in awk or the shell. JRA.
- #
--nawk 'BEGIN {FS=":"} 
-+awk 'BEGIN {FS=":"} 
- {
- 	if( $0 ~ "^#" ) {
- 		print $0
diff --git a/net/samba/patches/patch-ak b/net/samba/patches/patch-ak
deleted file mode 100644
index c9f7c7730c8..00000000000
--- a/net/samba/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2002/05/05 16:57:12 taca Exp $
-
---- Makefile.in.orig	Fri May  3 10:02:26 2002
-+++ Makefile.in
-@@ -51,7 +51,7 @@
- CONFIGFILE = $(CONFIGDIR)/smb.conf
- LMHOSTSFILE = $(CONFIGDIR)/lmhosts
- DRIVERFILE = $(CONFIGDIR)/printers.def
--PASSWD_PROGRAM = /bin/passwd
-+PASSWD_PROGRAM = /usr/bin/passwd
- # This is where smbpasswd et al go
- PRIVATEDIR = @privatedir@
- 
diff --git a/net/samba/patches/patch-am b/net/samba/patches/patch-am
deleted file mode 100644
index 1bfb658215a..00000000000
--- a/net/samba/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.3 2002/06/14 17:04:14 taca Exp $
-
---- param/loadparm.c.orig	Fri May  3 10:03:25 2002
-+++ param/loadparm.c
-@@ -655,7 +655,8 @@
- 	{CSC_POLICY_MANUAL, "manual"},
- 	{CSC_POLICY_DOCUMENTS, "documents"},
- 	{CSC_POLICY_PROGRAMS, "programs"},
--	{CSC_POLICY_DISABLE, "disable"}
-+	{CSC_POLICY_DISABLE, "disable"},
-+	{-1, NULL}
- };
- 
- /*