From a9ba7f86aed5404dc5883422003260dcf3873e1c Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Wed, 6 Jun 2007 11:39:53 +0000
Subject: [PATCH] adosfs support has been removed; remove it here as well to
 let this build.

---
 shells/sash/Makefile             |  3 ++-
 shells/sash/patches/patch-cmds_c | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 shells/sash/patches/patch-cmds_c

diff --git a/shells/sash/Makefile b/shells/sash/Makefile
index 5dc37e36126..30a374c1e8f 100644
--- a/shells/sash/Makefile
+++ b/shells/sash/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2002/08/07 18:31:33 wcobb Exp $
+# $OpenBSD: Makefile,v 1.8 2007/06/06 11:39:53 steven Exp $
 
 COMMENT=		"stand-alone shell with built-in commands"
 
 VERSION=		3.6
 DISTNAME=		sash-${VERSION}
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		shells
 HOMEPAGE=		http://www.canb.auug.org.au/~dbell/
 
diff --git a/shells/sash/patches/patch-cmds_c b/shells/sash/patches/patch-cmds_c
new file mode 100644
index 00000000000..cc4421f275c
--- /dev/null
+++ b/shells/sash/patches/patch-cmds_c
@@ -0,0 +1,32 @@
+$OpenBSD: patch-cmds_c,v 1.4 2007/06/06 11:39:53 steven Exp $
+--- cmds.c.orig	Wed Jun  6 13:34:53 2007
++++ cmds.c	Wed Jun  6 13:36:16 2007
+@@ -594,7 +594,6 @@ do_mount(int argc, const char ** argv)
+ #elif	HAVE_BSD_MOUNT
+ 	{
+ 		struct	    ufs_args ufs;
+-		struct	    adosfs_args adosfs;
+ 		struct	    iso_args iso;
+ 		struct	    mfs_args mfs;
+ 		struct	    msdosfs_args msdosfs;
+@@ -603,11 +602,6 @@ do_mount(int argc, const char ** argv)
+ 		if(!strcmp(type, "ffs") || !strcmp(type, "ufs")) {
+ 			ufs.fspec = (char*) argv[0];
+ 			args = &ufs;
+-		} else if(!strcmp(type, "adosfs")) {
+-			adosfs.fspec = (char*) argv[0];
+-			adosfs.uid = 0;
+-			adosfs.gid = 0;
+-			args = &adosfs;
+ 		} else if(!strcmp(type, "cd9660")) {
+ 			iso.fspec = (char*) argv[0];
+ 			args = &iso;
+@@ -622,7 +616,7 @@ do_mount(int argc, const char ** argv)
+ 		} else {
+ 			fprintf(stderr, "Unknown filesystem type: %s", type);
+ 			fprintf(stderr,
+-			    "Supported: ffs ufs adosfs cd9660 mfs msdos\n");
++			    "Supported: ffs ufs cd9660 mfs msdos\n");
+ 			return;
+ 		}
+