Remove net/samba20. Versions of samba<=2.2.8a have a security exploit.

Since this package is unmaintained, remove it altogether from pkgsrc.

19 files changed, 2 insertions, 1212 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 16096edf67d..1626eebfe7e 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3389 2003/09/15 22:17:21 recht Exp $
+$NetBSD: CHANGES,v 1.3390 2003/09/16 01:33:33 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -3707,3 +3707,4 @@ Changes to the packages collection and infrastructure in 2003:
 	Updated rocksndiamonds to 3.0.4 [adam 2003-09-15]
 	Updated rocksndiamonds-sdl to 3.0.4 [adam 2003-09-15]
 	Added py-TPG 2.1.6 [recht 2003-09-15]
+	Removed samba20 [jlam 2003-09-16]
diff --git a/net/samba20/DESCR b/net/samba20/DESCR
deleted file mode 100644
index 12a61dce0d4..00000000000
--- a/net/samba20/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-Samba is a suite of programs which work together to allow clients to
-access to a server's filespace and printers via the SMB (Server
-Message Block) protocol.
-
-In practice, this means that you can redirect disks and printers to
-Unix disks and printers from Lan Manager clients, Windows for
-Workgroups 3.11 clients, Windows NT clients, Linux clients and OS/2
-clients. There is also a generic Unix client program supplied as part
-of the suite which allows Unix users to use an ftp-like interface to
-access filespace and printers on any other SMB servers. This gives the
-capability for these operating systems to behave much like a LAN
-Server or Windows NT Server machine, only with added functionality and
-flexibility designed to make life easier for administrators.
-
-This package tracks the Samba-2.0.x releases that include support for
-the "share modes" directive that was removed in Samba-2.2.x.  The
-"share modes" directive is needed to support certain legacy MS-DOS
-applications.
diff --git a/net/samba20/INSTALL b/net/samba20/INSTALL
deleted file mode 100644
index 67df6166a88..00000000000
--- a/net/samba20/INSTALL
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.2 2001/11/21 17:17:44 jlam Exp $
-
-SAMBA_PRIVATE="@SAMBA_PRIVATE@"
-
-case ${STAGE} in
-POST-INSTALL)
-	# Create SMB password file
-	if [ ! -e ${SAMBA_PRIVATE}/smbpasswd ]
-	then
-		${ECHO} -n "Creating ${SAMBA_PRIVATE}/smbpasswd..."
-		${CHOWN} -R 0:0 ${SAMBA_PRIVATE}
-		${CAT} /etc/passwd | ${PKG_PREFIX}/sbin/mksmbpasswd	\
-			> ${SAMBA_PRIVATE}/smbpasswd
-		${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd
-		${CHMOD} 500 ${SAMBA_PRIVATE}
-		echo "done."
-	fi
-	;;
-esac
diff --git a/net/samba20/MESSAGE b/net/samba20/MESSAGE
deleted file mode 100644
index 98fd941f876..00000000000
--- a/net/samba20/MESSAGE
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/05/06 17:42:16 jmmv Exp $
-
-                    *===* Security Notes *===*
-
-The users' encrypted passwords stored in ${ETCDIR}/private/smbpasswd
-(default: /etc/samba/private/smbpasswd) *ARE PASSWORD EQUIVALENT*
-from the viewpoint of SMB protocol.  Do not weaken the permission
-mode of this file (default: root.wheel and rw-------) without any
-special reasons.  And please note that even if you pkg_delete this
-port, pkg_delete will *NOT* remove the smbpasswd file because
-pkg_delete can be used for upgrading this package.  If you won't use
-this package anymore, I strongly recommend that you remove the
-smbpasswd file manually.
-===========================================================================
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
deleted file mode 100644
index 5f81a114704..00000000000
--- a/net/samba20/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2003/08/30 22:51:28 jlam Exp $
-
-DISTNAME=		samba-2.0.10
-PKGREVISION=				1
-WRKSRC=			${WRKDIR}/${DISTNAME}/source
-CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.samba.org/pub/samba/old-versions/ \
-			ftp://samba.anu.edu.au/pub/samba/old-versions/ \
-			ftp://de.samba.org/samba.org/
-
-MAINTAINER=		jlam@NetBSD.org
-HOMEPAGE=		http://www.samba.org/
-COMMENT=		SMB/CIFS protocol server suite for UNIX
-
-BUILD_USES_MSGFMT=	yes
-GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
-USE_PKGINSTALL=		yes
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_SYSCONFSUBDIR?=	samba
-
-SAMBA_LOGDIR?=		/var/log
-SAMBA_LOCKDIR?=		/var/run/samba
-SAMBA_ETCDIR?=		${PKG_SYSCONFDIR}
-SAMBA_PRIVATE?=		${SAMBA_ETCDIR}/private
-SAMBA_DATADIR=		${PREFIX}/share
-
-MAKE_ENV+=		CONFIGDIR=${SAMBA_ETCDIR}
-
-CONFIGURE_ARGS+=	--localstatedir=${SAMBA_LOGDIR}
-CONFIGURE_ARGS+=	--with-lockdir=${SAMBA_LOCKDIR}
-CONFIGURE_ARGS+=	--with-privatedir=${SAMBA_PRIVATE}
-CONFIGURE_ARGS+=	--with-swatdir=${PREFIX}/share/swat
-CONFIGURE_ARGS+=	--with-sambabook=${PREFIX}/share/swat/using_samba
-
-CONFIGURE_ARGS+=	--with-ssl
-CONFIGURE_ARGS+=	--with-sslinc=${SSLBASE}
-CFLAGS+=		-I${SSLBASE}/include/openssl      # ssl.h, err.h
-
-.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.include "../../print/cups/buildlink2.mk"
-BUILD_DEFS+=		USE_CUPS
-.endif
-
-.if defined(USE_PAM)
-.include "../../security/PAM/buildlink2.mk"
-CONFIGURE_ARGS+=	--with-pam
-.endif
-
-# The following are Linux-only options.
-CONFIGURE_ARGS+=	--without-smbwrapper
-CONFIGURE_ARGS+=	--without-smbmount
-
-DOCDIR=			${PREFIX}/share/doc/samba
-HTMLDIR=		${PREFIX}/share/doc/html/samba
-EXAMPLESDIR=		${PREFIX}/share/examples/samba
-
-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+=		ETCDIR=${SAMBA_ETCDIR}
-
-CONF_FILES=		${EXAMPLESDIR}/smb.conf.sample ${SAMBA_ETCDIR}/smb.conf
-RCD_SCRIPTS=		samba nmbd smbd
-MAKE_DIRS=		${SAMBA_LOCKDIR}
-OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_PRIVATE}
-
-post-install:
-	# Install Samba documentation.
-	${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
-	cd ${WRKDIR}/${DISTNAME}/docs;					\
-		${INSTALL_DATA} announce *.reg textdocs/* ${DOCDIR};	\
-		${INSTALL_DATA} faq/*.html ${HTMLDIR}
-
-	# Install Samba examples.
-	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKDIR}/${DISTNAME}/examples/* ${EXAMPLESDIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
-	${CHMOD} -R ugo-w ${EXAMPLESDIR}
-
-	${MV} ${PREFIX}/bin/convert_smbpasswd ${PREFIX}/sbin/convert_smbpasswd
-	${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/gettext-lib/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/samba20/PLIST b/net/samba20/PLIST
deleted file mode 100644
index afca26b3cef..00000000000
--- a/net/samba20/PLIST
+++ /dev/null
@@ -1,397 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/21 17:17:44 jlam Exp $
-bin/addtosmbpass
-bin/make_printerdef
-bin/make_smbcodepage
-bin/make_unicodemap
-bin/nmblookup
-bin/rpcclient
-bin/smbclient
-bin/smbpasswd
-bin/smbspool
-bin/smbstatus
-bin/smbtar
-bin/testparm
-bin/testprns
-etc/rc.d/nmbd
-etc/rc.d/samba
-etc/rc.d/smbd
-man/man1/make_smbcodepage.1
-man/man1/make_unicodemap.1
-man/man1/nmblookup.1
-man/man1/smbclient.1
-man/man1/smbrun.1
-man/man1/smbsh.1
-man/man1/smbstatus.1
-man/man1/smbtar.1
-man/man1/testparm.1
-man/man1/testprns.1
-man/man5/lmhosts.5
-man/man5/smb.conf.5
-man/man5/smbpasswd.5
-man/man7/samba.7
-man/man8/nmbd.8
-man/man8/smbd.8
-man/man8/smbmnt.8
-man/man8/smbmount.8
-man/man8/smbpasswd.8
-man/man8/smbspool.8
-man/man8/smbumount.8
-man/man8/swat.8
-sbin/convert_smbpasswd
-sbin/mksmbpasswd
-sbin/nmbd
-sbin/smbd
-sbin/swat
-share/doc/html/samba/Samba-Server-FAQ-1.html
-share/doc/html/samba/Samba-Server-FAQ-2.html
-share/doc/html/samba/Samba-Server-FAQ.html
-share/doc/html/samba/Samba-meta-FAQ-1.html
-share/doc/html/samba/Samba-meta-FAQ-2.html
-share/doc/html/samba/Samba-meta-FAQ-3.html
-share/doc/html/samba/Samba-meta-FAQ-4.html
-share/doc/html/samba/Samba-meta-FAQ-5.html
-share/doc/html/samba/Samba-meta-FAQ-6.html
-share/doc/html/samba/Samba-meta-FAQ.html
-share/doc/html/samba/sambafaq-1.html
-share/doc/html/samba/sambafaq-2.html
-share/doc/html/samba/sambafaq-3.html
-share/doc/html/samba/sambafaq-4.html
-share/doc/html/samba/sambafaq-5.html
-share/doc/html/samba/sambafaq.html
-share/doc/samba/Application_Serving.txt
-share/doc/samba/BROWSING-Config.txt
-share/doc/samba/BROWSING.txt
-share/doc/samba/BUGS.txt
-share/doc/samba/CRLF-LF-Conversions.txt
-share/doc/samba/CVS_ACCESS.txt
-share/doc/samba/DHCP-Server-Configuration.txt
-share/doc/samba/DIAGNOSIS.txt
-share/doc/samba/DNIX.txt
-share/doc/samba/DOMAIN.txt
-share/doc/samba/DOMAIN_CONTROL.txt
-share/doc/samba/DOMAIN_MEMBER.txt
-share/doc/samba/ENCRYPTION.txt
-share/doc/samba/Faxing.txt
-share/doc/samba/File-Cacheing.txt
-share/doc/samba/GOTCHAS.txt
-share/doc/samba/HINTS.txt
-share/doc/samba/INSTALL.sambatar
-share/doc/samba/MIRRORS.txt
-share/doc/samba/Macintosh_Clients.txt
-share/doc/samba/NT-Guest-Access.txt
-share/doc/samba/NT4-Locking.reg
-share/doc/samba/NT4_PlainPassword.reg
-share/doc/samba/NTDOMAIN.txt
-share/doc/samba/NT_Security.txt
-share/doc/samba/NetBIOS.txt
-share/doc/samba/OS2-Client-HOWTO.txt
-share/doc/samba/PRINTER_DRIVER.txt
-share/doc/samba/PROFILES.txt
-share/doc/samba/PROJECTS
-share/doc/samba/Passwords.txt
-share/doc/samba/Printing.txt
-share/doc/samba/README.DCEDFS
-share/doc/samba/README.jis
-share/doc/samba/README.sambatar
-share/doc/samba/Recent-FAQs.txt
-share/doc/samba/RoutedNetworks.txt
-share/doc/samba/SCO.txt
-share/doc/samba/SMBTAR.notes
-share/doc/samba/SSLeay.txt
-share/doc/samba/Speed.txt
-share/doc/samba/Speed2.txt
-share/doc/samba/Support.txt
-share/doc/samba/Tracing.txt
-share/doc/samba/UNIX-SMB.txt
-share/doc/samba/UNIX_INSTALL.txt
-share/doc/samba/UNIX_SECURITY.txt
-share/doc/samba/Win2000_PlainPassword.reg
-share/doc/samba/Win95.txt
-share/doc/samba/Win95_PlainPassword.reg
-share/doc/samba/Win98_PlainPassword.reg
-share/doc/samba/Win9X-CacheHandling.reg
-share/doc/samba/WinNT.txt
-share/doc/samba/WindowsTerminalServer.reg
-share/doc/samba/announce
-share/doc/samba/cifsntdomain.txt
-share/doc/samba/security_level.txt
-share/doc/samba/smbmount.txt
-share/examples/samba/README
-share/examples/samba/autofs/README
-share/examples/samba/autofs/auto.a
-share/examples/samba/dce-dfs/README
-share/examples/samba/dce-dfs/smb.conf
-share/examples/samba/misc/extra_smbstatus
-share/examples/samba/misc/wall.perl
-share/examples/samba/printer-accounting/README
-share/examples/samba/printer-accounting/acct-all
-share/examples/samba/printer-accounting/acct-sum
-share/examples/samba/printer-accounting/hp5-redir
-share/examples/samba/printer-accounting/lp-acct
-share/examples/samba/printer-accounting/printcap
-share/examples/samba/printing/smbprint
-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
-share/examples/samba/tridge/smb.conf.WinNT
-share/examples/samba/tridge/smb.conf.fjall
-share/examples/samba/tridge/smb.conf.lapland
-share/examples/samba/tridge/smb.conf.vittjokk
-share/examples/samba/validchars/msdos70.out
-share/examples/samba/validchars/nwdos70.out
-share/examples/samba/validchars/readme
-share/examples/samba/validchars/validchr.c
-share/examples/samba/validchars/validchr.com
-share/examples/samba/wins_hook/README
-share/examples/samba/wins_hook/dns_update
-share/samba/codepages/codepage.1251
-share/samba/codepages/codepage.437
-share/samba/codepages/codepage.737
-share/samba/codepages/codepage.775
-share/samba/codepages/codepage.850
-share/samba/codepages/codepage.852
-share/samba/codepages/codepage.861
-share/samba/codepages/codepage.866
-share/samba/codepages/codepage.932
-share/samba/codepages/codepage.936
-share/samba/codepages/codepage.949
-share/samba/codepages/codepage.950
-share/samba/codepages/unicode_map.437
-share/samba/codepages/unicode_map.737
-share/samba/codepages/unicode_map.850
-share/samba/codepages/unicode_map.852
-share/samba/codepages/unicode_map.861
-share/samba/codepages/unicode_map.866
-share/samba/codepages/unicode_map.932
-share/samba/codepages/unicode_map.936
-share/samba/codepages/unicode_map.949
-share/samba/codepages/unicode_map.950
-share/samba/codepages/unicode_map.ISO8859-1
-share/samba/codepages/unicode_map.ISO8859-2
-share/samba/codepages/unicode_map.ISO8859-5
-share/samba/codepages/unicode_map.ISO8859-7
-share/samba/codepages/unicode_map.KOI8-R
-share/swat/help/DOMAIN_MEMBER.html
-share/swat/help/NT_Security.html
-share/swat/help/lmhosts.5.html
-share/swat/help/make_smbcodepage.1.html
-share/swat/help/make_unicodemap.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/smbmnt.8.html
-share/swat/help/smbmount.8.html
-share/swat/help/smbpasswd.5.html
-share/swat/help/smbpasswd.8.html
-share/swat/help/smbrun.1.html
-share/swat/help/smbsh.1.html
-share/swat/help/smbspool.8.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/help/welcome.ja_JP.ujis.html
-share/swat/images/globals.gif
-share/swat/images/home.gif
-share/swat/images/passwd.gif
-share/swat/images/printers.gif
-share/swat/images/samba.gif
-share/swat/images/shares.gif
-share/swat/images/status.gif
-share/swat/images/viewconfig.gif
-share/swat/include/footer.html
-share/swat/include/header.html
-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/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/index.html
-share/swat/using_samba/inx.html
-share/swat/using_samba/licenseinfo.html
-share/swat/using_samba/this_edition.html
-@dirrm share/swat/using_samba/gifs
-@dirrm share/swat/using_samba/figs
-@dirrm share/swat/using_samba
-@dirrm share/swat/include
-@dirrm share/swat/images
-@dirrm share/swat/help
-@dirrm share/swat
-@dirrm share/samba/codepages
-@dirrm share/samba
-@dirrm share/examples/samba/wins_hook
-@dirrm share/examples/samba/validchars
-@dirrm share/examples/samba/tridge
-@dirrm share/examples/samba/thoralf
-@dirrm share/examples/samba/svr4-startup
-@dirrm share/examples/samba/simple
-@dirrm share/examples/samba/printing
-@dirrm share/examples/samba/printer-accounting
-@dirrm share/examples/samba/misc
-@dirrm share/examples/samba/dce-dfs
-@dirrm share/examples/samba/autofs
-@dirrm share/examples/samba
-@dirrm share/doc/samba
-@dirrm share/doc/html/samba
diff --git a/net/samba20/distinfo b/net/samba20/distinfo
deleted file mode 100644
index 8067c60d4c4..00000000000
--- a/net/samba20/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/08/03 13:46:02 jlam Exp $
-
-SHA1 (samba-2.0.10.tar.gz) = 368fd7bb25c53fc351357c83f0ff70b1d38e37ca
-Size (samba-2.0.10.tar.gz) = 3496800 bytes
-SHA1 (patch-aa) = 50c0bc2f64bdfc12b0de84db4b9aae31d035a5c7
-SHA1 (patch-ab) = 3222b66692124edede7f35f3cbb6f4830b70359b
-SHA1 (patch-ac) = 5b87200b0c2439cfb192db608c463fe106460848
-SHA1 (patch-ad) = 72aadc753abda45f8a541f6caeb7a9afeeb8f034
-SHA1 (patch-ae) = 22f67adc1093074a32b81d29a60a11d9350223ea
-SHA1 (patch-af) = 948450d493887b38f5f12a120c6f914c6c3a0c89
-SHA1 (patch-ag) = b182c27c5e5722820343c879ad6390c1ce51a895
-SHA1 (patch-ah) = 157ac02652861492a456aa65016409d8744cdd17
diff --git a/net/samba20/files/nmbd.sh b/net/samba20/files/nmbd.sh
deleted file mode 100755
index 0b77b2a7645..00000000000
--- a/net/samba20/files/nmbd.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: nmbd.sh,v 1.6 2002/09/20 02:01:59 grant Exp $
-#
-# PROVIDE: nmbd
-# REQUIRE: DAEMON
-
-if [ -f /etc/rc.subr ]
-then
-	. /etc/rc.subr
-fi
-
-name="nmbd"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-required_files="@SAMBA_ETCDIR@/smb.conf"
-extra_commands="reload"
-command_args="-D"		# _must_ start as daemon from rc.d;
-				# add more flags through ${${name}_flags}
-
-reload_cmd=":"			# avoid dumping debug output on SIGHUP
-
-if [ -f /etc/rc.subr ]
-then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n ' ${name}'
-	${command} ${nmbd_flags} ${command_args}
-fi
diff --git a/net/samba20/files/samba.sh b/net/samba20/files/samba.sh
deleted file mode 100644
index 949a3598b12..00000000000
--- a/net/samba20/files/samba.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: samba.sh,v 1.9 2002/09/20 02:01:59 grant Exp $
-#
-# KEYWORD: nostart
-
-if [ -f /etc/rc.subr ]
-then
-	. /etc/rc.subr
-fi
-
-rcd_dir=`@DIRNAME@ $0`
-
-# NOTE: run_rc_command sets $rc_arg
-#
-forward_commands()
-{
-	# Backward compat with NetBSD <1.6:
-	[ -z "$rc_arg" ] && rc_arg=$_arg
-
-	for file in $COMMAND_LIST; do
-		$rcd_dir/$file $rc_arg
-	done
-}
-
-reverse_commands()
-{
-	# Backward compat with NetBSD <1.6:
-	[ -z "$rc_arg" ] && rc_arg=$_arg
-
-	REVCOMMAND_LIST=
-	for file in $COMMAND_LIST; do
-		REVCOMMAND_LIST="$file $REVCOMMAND_LIST"
-	done
-	for file in $REVCOMMAND_LIST; do
-		$rcd_dir/$file $rc_arg
-	done
-}
-
-COMMAND_LIST="nmbd smbd"
-
-name="samba"
-start_cmd="forward_commands"
-stop_cmd="reverse_commands"
-reload_cmd="forward_commands"
-status_cmd="forward_commands"
-extra_commands="reload status"
-
-if [ -f /etc/rc.subr ]
-then
-	run_rc_command "$1"
-else
-	@ECHO@ -n ' ${name}'
-	_arg="$1"
-	${start_cmd}
-fi
diff --git a/net/samba20/files/smb.conf.sample b/net/samba20/files/smb.conf.sample
deleted file mode 100644
index 7e78c0b90f2..00000000000
--- a/net/samba20/files/smb.conf.sample
+++ /dev/null
@@ -1,252 +0,0 @@
-# $NetBSD: smb.conf.sample,v 1.1.1.1 2001/08/03 13:24:37 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
-;   password server = <NT-Server-Name>
-
-# 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
-   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
-
-# Use only if you have an NT server on your network that has been
-# configured at install time to be a primary domain controller.
-;   domain controller = <NT-Domain-Controller-SMBName>
-
-# 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/samba20/files/smbd.sh b/net/samba20/files/smbd.sh
deleted file mode 100755
index 2d77e85f897..00000000000
--- a/net/samba20/files/smbd.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: smbd.sh,v 1.7 2002/09/20 02:01:59 grant Exp $
-#
-# PROVIDE: smbd
-# REQUIRE: DAEMON
-
-if [ -f /etc/rc.subr ]
-then
-	. /etc/rc.subr
-fi
-
-name="smbd"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-required_files="@SAMBA_ETCDIR@/smb.conf"
-extra_commands="reload"
-command_args="-D"		# _must_ start as daemon from rc.d;
-				# add more flags through ${${name}_flags}
-
-if [ -f /etc/rc.subr ]
-then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n ' ${name}'
-	${command} ${smbd_flags} ${command_args}
-fi
diff --git a/net/samba20/patches/patch-aa b/net/samba20/patches/patch-aa
deleted file mode 100644
index a70ba5b60cc..00000000000
--- a/net/samba20/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/08/03 13:46:02 jlam Exp $
-
---- Makefile.in.orig	Thu Mar 16 17:57:08 2000
-+++ Makefile.in
-@@ -14,6 +14,8 @@
- LDFLAGS=@LDFLAGS@
- AWK=@AWK@
- 
-+TERMLIBS=@TERMLIBS@
-+
- INSTALLCMD=@INSTALL@
- 
- VPATH=@srcdir@
-@@ -23,12 +25,12 @@
- 
- BASEDIR= @prefix@
- BINDIR = @bindir@
--# we don't use sbindir because we want full compatibility with
--# the previous releases of Samba
--SBINDIR = @bindir@
-+SBINDIR = @sbindir@
- LIBDIR = @libdir@
- VARDIR = @localstatedir@
- MANDIR = @mandir@
-+DATADIR = @datadir@
-+CONFIGDIR?= $(BASEDIR)/etc
- SAMBABOOK = @sambabook@
- 
- # The permissions to give the executables
-@@ -39,10 +41,10 @@
- # or in smb.conf (see smb.conf(5))
- SMBLOGFILE = $(VARDIR)/log.smb
- NMBLOGFILE = $(VARDIR)/log.nmb
--CONFIGFILE = $(LIBDIR)/smb.conf
--LMHOSTSFILE = $(LIBDIR)/lmhosts
--DRIVERFILE = $(LIBDIR)/printers.def
--PASSWD_PROGRAM = /bin/passwd
-+CONFIGFILE = $(CONFIGDIR)/smb.conf
-+LMHOSTSFILE = $(CONFIGDIR)/lmhosts
-+DRIVERFILE = $(CONFIGDIR)/printers.def
-+PASSWD_PROGRAM = /usr/bin/passwd
- # This is where smbpasswd et al go
- PRIVATEDIR = @privatedir@
- 
-@@ -55,7 +57,7 @@
- LOCKDIR = @lockdir@
- 
- # The directory where code page definition files go
--CODEPAGEDIR = $(LIBDIR)/codepages
-+CODEPAGEDIR = $(DATADIR)/samba/codepages
- 
- # The current codepage definition list.
- CODEPAGELIST= 437 737 775 850 852 861 932 866 949 950 936 1251 ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 KOI8-R
-@@ -377,7 +379,7 @@
- 
- bin/smbclient: $(CLIENT_OBJ) bin/.dummy
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(TERMLIBS) $(LIBS)
- 
- bin/smbspool: $(CUPS_OBJ) bin/.dummy
- 	@echo Linking $@
diff --git a/net/samba20/patches/patch-ab b/net/samba20/patches/patch-ab
deleted file mode 100644
index 9cc86d69b3a..00000000000
--- a/net/samba20/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/08/03 13:46:02 jlam Exp $
-
---- client/client.c.orig	Tue Apr 17 19:00:52 2001
-+++ client/client.c
-@@ -1180,7 +1180,7 @@
- 				"find . -name \"%s\" -print > %s",p,tmpname);
- 		else
- 			slprintf(cmd,sizeof(pstring)-1,
--				"find . -maxdepth 1 -name \"%s\" -print > %s",p,tmpname);
-+				"/bin/ls -1 %s > %s",p,tmpname);
- 		system(cmd);
- 		close(fd);
- 
-@@ -1622,15 +1622,12 @@
- ****************************************************************************/
- static void cmd_history(void)
- {
--	HIST_ENTRY **hlist;
- 	register int i;
- 
--	hlist = history_list ();	/* Get pointer to history list */
--	
--	if (hlist)			/* If list not empty */
-+	if (history_length)		/* If history is not empty */
- 	{
--		for (i = 0; hlist[i]; i++)	/* then display it */
--			DEBUG(0, ("%d: %s\n", i, hlist[i]->line));
-+		for (i = 1; i <= history_length; i++)	/* then display it */
-+			DEBUG(0, ("%d: %s\n", i, history_get(i)->line));
- 	}
- }
- #  endif 
diff --git a/net/samba20/patches/patch-ac b/net/samba20/patches/patch-ac
deleted file mode 100644
index 9f307be39ac..00000000000
--- a/net/samba20/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/08/03 13:46:02 jlam Exp $
-
---- configure.in.orig	Tue Apr 17 19:00:52 2001
-+++ configure.in
-@@ -310,10 +310,18 @@
- 
- ###############################################
- # test for where we get readline() from
-+TERMLIBS=
- if test "$ac_cv_header_readline_h" = "yes" ||
-    test "$ac_cv_header_readline_readline_h" = "yes"; then
--  AC_CHECK_LIB(readline,readline)
-+  for termlib in termcap ncurses curses terminfo termlib; do
-+    AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
-+  done
-+  AC_CHECK_LIB(readline, readline,
-+    [TERMLIBS="-lreadline $TERMLIBS"
-+    AC_DEFINE(HAVE_LIBREADLINE)
-+    break], [TERMLIBS=], $TERMLIBS)
- fi
-+AC_SUBST(TERMLIBS)
- 
- 
- # The following test taken from the cvs sources
diff --git a/net/samba20/patches/patch-ad b/net/samba20/patches/patch-ad
deleted file mode 100644
index c4240a46112..00000000000
--- a/net/samba20/patches/patch-ad
+++ /dev/null
@@ -1,114 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2001/08/03 13:46:03 jlam Exp $
-
---- configure.orig	Tue Apr 17 19:00:52 2001
-+++ configure
-@@ -3705,18 +3705,61 @@
- 
- ###############################################
- # test for where we get readline() from
-+TERMLIBS=
- if test "$ac_cv_header_readline_h" = "yes" ||
-    test "$ac_cv_header_readline_readline_h" = "yes"; then
-+  for termlib in termcap ncurses curses terminfo termlib; do
-+    echo $ac_n "checking for tgetent in -l${termlib}""... $ac_c" 1>&6
-+echo "configure:3714: checking for tgetent in -l${termlib}" >&5
-+ac_lib_var=`echo ${termlib}'_'tgetent | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-l${termlib}  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 3722 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char tgetent();
-+
-+int main() {
-+tgetent()
-+; return 0; }
-+EOF
-+if { (eval echo configure:3733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  TERMLIBS="-l${termlib}"; break
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+  done
-   echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
--echo "configure:3712: checking for readline in -lreadline" >&5
-+echo "configure:3755: checking for readline in -lreadline" >&5
- ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lreadline  $LIBS"
-+LIBS="-lreadline $TERMLIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3720 "configure"
-+#line 3763 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3727,7 +3770,7 @@
- readline()
- ; return 0; }
- EOF
--if { (eval echo configure:3731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3742,21 +3785,21 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
-+  TERMLIBS="-lreadline $TERMLIBS"
-+    cat >> confdefs.h <<\EOF
-+#define HAVE_LIBREADLINE 1
- EOF
- 
--  LIBS="-lreadline $LIBS"
--
-+    break
- else
-   echo "$ac_t""no" 1>&6
-+TERMLIBS=
- fi
- 
- fi
- 
- 
-+
- # The following test taken from the cvs sources
- # If we can't find connect, try looking in -lsocket, -lnsl, and -linet.
- # The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has
-@@ -10895,6 +10938,7 @@
- s%@AUTOHEADER@%$AUTOHEADER%g
- s%@CPP@%$CPP%g
- s%@LIBOBJS@%$LIBOBJS%g
-+s%@TERMLIBS@%$TERMLIBS%g
- s%@ROFF@%$ROFF%g
- s%@QUOTAOBJS@%$QUOTAOBJS%g
- s%@privatedir@%$privatedir%g
diff --git a/net/samba20/patches/patch-ae b/net/samba20/patches/patch-ae
deleted file mode 100644
index 678af70bad9..00000000000
--- a/net/samba20/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/08/03 13:46:03 jlam Exp $
-
---- script/convert_smbpasswd.orig	Wed Nov  4 21: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/samba20/patches/patch-af b/net/samba20/patches/patch-af
deleted file mode 100644
index 679a9308aec..00000000000
--- a/net/samba20/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/08/03 13:46:03 jlam Exp $
-
---- script/installbin.sh.orig	Wed Nov 10 09:41:12 1999
-+++ script/installbin.sh
-@@ -30,7 +30,9 @@
-    mv $BINDIR/$p2 $BINDIR/$p2.old
-  fi
-  cp $p $BINDIR/
-+ strip $BINDIR/$p2
-  chmod $INSTALLPERMS $BINDIR/$p2
-+ rm -f $BINDIR/$p2.old
- 
-  # this is a special case, mount needs this in a specific location
-  if [ $p2 = smbmount ]; then
diff --git a/net/samba20/patches/patch-ag b/net/samba20/patches/patch-ag
deleted file mode 100644
index 3a79617661a..00000000000
--- a/net/samba20/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/08/03 13:46:04 jlam Exp $
-
---- script/installcp.sh.orig	Thu Mar 16 17:59:40 2000
-+++ script/installcp.sh
-@@ -12,7 +12,7 @@
- echo Installing codepage files in $CODEPAGEDIR
- for d in $LIBDIR $CODEPAGEDIR; do
- if [ ! -d $d ]; then
--mkdir $d
-+mkdir -p $d
- if [ ! -d $d ]; then
-   echo Failed to make directory $d
-   exit 1
diff --git a/net/samba20/patches/patch-ah b/net/samba20/patches/patch-ah
deleted file mode 100644
index 45d6d4d0a6e..00000000000
--- a/net/samba20/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2001/08/03 13:46:04 jlam Exp $
-
---- script/installswat.sh.orig	Thu Mar 16 17:59:40 2000
-+++ script/installswat.sh
-@@ -10,7 +10,7 @@
- 
- for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do
-     if [ ! -d $d ]; then
--        mkdir $d
-+        mkdir -p $d
-         if [ ! -d $d ]; then
-             echo Failed to make directory $d, does $USER have privileges?
-             exit 1