diff --git a/shells/Makefile b/shells/Makefile
new file mode 100644
index 00000000000..7ae4af52cda
--- /dev/null
+++ b/shells/Makefile
@@ -0,0 +1,13 @@
+# $OpenBSD: Makefile,v 1.1.1.1 1997/11/18 01:20:00 gene Exp $
+# Id: Makefile,v 1.13 1997/01/03 00:40:55 max Exp $
+#
+
+    SUBDIR += bash
+    SUBDIR += bash2
+    SUBDIR += es
+    SUBDIR += scsh
+    SUBDIR += pdksh
+    SUBDIR += tcsh
+    SUBDIR += zsh
+
+.include <bsd.port.subdir.mk>
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
new file mode 100644
index 00000000000..71d94c86ff2
--- /dev/null
+++ b/shells/bash/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	bash
+# Version required:     1.14.7
+# Date created:		21 August 1994
+# Whom:			jkh
+#
+# $OpenBSD: Makefile,v 1.1.1.1 1997/11/18 01:20:02 gene Exp $
+# Id: Makefile,v 1.25 1997/06/26 06:23:23 fenner Exp $
+#
+
+DISTNAME=       bash-1.14.7
+CATEGORIES=	shells
+MASTER_SITES=   ${MASTER_SITE_GNU}
+
+MAINTAINER=	gene@OpenBSD.ORG
+
+WRKSRC=         ${WRKDIR}/${DISTNAME}
+
+# Don't compress manpages or .so not works.
+
+post-install:
+	@if [ ! -f ${PREFIX}/info/dir ]; then \
+	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	 fi
+	@install-info ${PREFIX}/info/bash.info ${PREFIX}/info/dir
+
+.include <bsd.port.mk>
diff --git a/shells/bash/files/md5 b/shells/bash/files/md5
new file mode 100644
index 00000000000..721cbbd91ab
--- /dev/null
+++ b/shells/bash/files/md5
@@ -0,0 +1 @@
+MD5 (bash-1.14.7.tar.gz) = 2ba8f27c9861d57826e695278a240a04
diff --git a/shells/bash/patches/patch-aa b/shells/bash/patches/patch-aa
new file mode 100644
index 00000000000..44de65ec4a7
--- /dev/null
+++ b/shells/bash/patches/patch-aa
@@ -0,0 +1,11 @@
+--- Makefile.orig	Sun Jun 11 11:41:48 1995
++++ Makefile	Wed Aug 13 00:41:35 1997
+@@ -10,7 +10,7 @@
+ # If you haven't read README, now might be a good time.
+ 
+ # Include some boilerplate Gnu makefile definitions.
+-prefix = /usr/local
++prefix = $(PREFIX)
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ srcdir = .
diff --git a/shells/bash/patches/patch-ab b/shells/bash/patches/patch-ab
new file mode 100644
index 00000000000..908154888e5
--- /dev/null
+++ b/shells/bash/patches/patch-ab
@@ -0,0 +1,56 @@
+*** cpp-Makefile.orig	Sun Jun 11 22:44:05 1995
+--- cpp-Makefile	Wed Jul 19 20:17:18 1995
+***************
+*** 133,139 ****
+--- 133,143 ----
+     /usr/include.  Then it will break.) */
+  CC = gcc -traditional -I/usr/include $(GCC_EXTRAS)
+  #  else /* HAVE_FIXED_INCLUDES */
++ #ifdef __FreeBSD__
++ CC += $(GCC_EXTRAS)
++ #else
+  CC = gcc $(GCC_EXTRAS)
++ #endif
+  #  endif /* HAVE_FIXED_INCLUDES */
+  #else /* !HAVE_GCC */
+  CC = CPP_CC
+***************
+*** 151,158 ****
+--- 155,167 ----
+  AR = ar
+  
+  INSTALL = $(SUPPORT_SRC)install.sh
++ #ifndef __FreeBSD__
+  INSTALL_PROGRAM = $(INSTALL) -c
+  INSTALL_DATA = $(INSTALL) -c -m 644
++ #else
++ INSTALL_PROGRAM = install -c -o bin -g bin -m 555
++ INSTALL_DATA = install -c -o bin -g bin -m 644
++ #endif
+  
+  COMPRESS = gzip
+  COMPRESS_EXT = .gz
+***************
+*** 300,306 ****
+--- 309,317 ----
+  /**/# The GNU coding standards don't recognize the possibility that
+  /**/# other information besides optimization and debugging might be
+  /**/# passed to cc.  A different name should have been used.
++ #ifndef __FreeBSD__
+  CFLAGS = -O -g
++ #endif
+  
+  SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(STDLIB) $(LIMITSH) \
+         $(GROUPS) $(RESOURCE) $(PARAM) $(SIGHANDLER) $(SYSDEP) $(WAITH) \
+***************
+*** 308,313 ****
+--- 319,327 ----
+         $(VARARGSH) $(STRCHR) $(STRCASE) $(DEVFD) \
+         -D$(Machine) -D$(OS)
+  LDFLAGS	= $(NOSHARE) $(SYSDEP_LD) $(EXTRA_LD_PATH) $(PROFILE_FLAGS) $(CFLAGS)
++ #ifdef __FreeBSD__
++ LDFLAGS += -s
++ #endif
+  CCFLAGS	= $(PROFILE_FLAGS) $(SYSTEM_FLAGS) -DSHELL $(ALLOCA_CFLAGS) \
+  	  $(MALLOC_CFLAGS) $(CFLAGS)
+  CPPFLAGS= -I. -I$(srcdir) -I$(LIBSRC)
diff --git a/shells/bash/patches/patch-ac b/shells/bash/patches/patch-ac
new file mode 100644
index 00000000000..4176de4b36a
--- /dev/null
+++ b/shells/bash/patches/patch-ac
@@ -0,0 +1,41 @@
+*** readline.c.orig	Wed May 24 18:43:28 1995
+--- lib/readline/readline.c	Wed Jul 19 20:26:53 1995
+***************
+*** 958,964 ****
+  static void
+  readline_initialize_everything ()
+  {
+!   char *t;
+  
+    /* Find out if we are running in Emacs. */
+    running_in_emacs = getenv ("EMACS") != (char *)0;
+--- 958,964 ----
+  static void
+  readline_initialize_everything ()
+  {
+!   char *t, *t1;
+  
+    /* Find out if we are running in Emacs. */
+    running_in_emacs = getenv ("EMACS") != (char *)0;
+***************
+*** 993,1000 ****
+    /* Check for LC_CTYPE and use its value to decide the defaults for
+       8-bit character input and output. */
+    t = getenv ("LC_CTYPE");
+!   if (t && (strcmp (t, "iso-8859-1") == 0 || strcmp (t, "iso_8859_1") == 0 ||
+!   	    strcmp (t, "ISO-8859-1") == 0))
+      {
+        _rl_meta_flag = 1;
+        _rl_convert_meta_chars_to_ascii = 0;
+--- 993,1003 ----
+    /* Check for LC_CTYPE and use its value to decide the defaults for
+       8-bit character input and output. */
+    t = getenv ("LC_CTYPE");
+!   t1 = getenv ("LANG");
+!   if (t && (strstr (t, "8859-1") != NULL || strstr (t, "8859_1") != NULL ||
+! 	  strstr (t, "KOI8-R") != NULL || strstr (t, "koi8-r") != NULL) ||
+!       t1 && (strstr (t1, "8859-1") != NULL || strstr (t1, "8859_1") != NULL ||
+! 	   strstr (t1, "KOI8-R") != NULL || strstr (t1, "koi8-r") != NULL))
+      {
+        _rl_meta_flag = 1;
+        _rl_convert_meta_chars_to_ascii = 0;
diff --git a/shells/bash/patches/patch-ad b/shells/bash/patches/patch-ad
new file mode 100644
index 00000000000..956d4d2ddbd
--- /dev/null
+++ b/shells/bash/patches/patch-ad
@@ -0,0 +1,47 @@
+*** documentation/Makefile.orig	Mon Jun 12 03:45:55 1995
+--- documentation/Makefile	Mon Jun 16 19:30:13 1997
+***************
+*** 49,55 ****
+  	$(RM) $@
+  	${NROFF} -man $< > $@
+  
+! all: ps info dvi text
+  
+  ps: bash.ps readline.ps article.ps
+  dvi: features.dvi features.ps 
+--- 49,55 ----
+  	$(RM) $@
+  	${NROFF} -man $< > $@
+  
+! all: info # ps dvi text
+  
+  ps: bash.ps readline.ps article.ps
+  dvi: features.dvi features.ps 
+***************
+*** 90,101 ****
+  
+  installdirs:
+  	-[ -d $(mandir) ] || mkdir $(mandir)
+! 	-[ -d $(man3dir) ] || mkdir $(man3dir)
+  	-[ -d $(infodir) ] || mkdir $(infodir)
+  
+  install: all installdirs
+  	$(INSTALL_DATA) bash.1 $(mandir)
+! 	$(INSTALL_DATA) readline.3 $(man3dir)
+  	$(INSTALL_DATA) features.info $(infodir)/bash.info
+  
+  uninstall:
+--- 90,102 ----
+  
+  installdirs:
+  	-[ -d $(mandir) ] || mkdir $(mandir)
+! #       -[ -d $(man3dir) ] || mkdir $(man3dir)
+  	-[ -d $(infodir) ] || mkdir $(infodir)
+  
+  install: all installdirs
+  	$(INSTALL_DATA) bash.1 $(mandir)
+! 	$(INSTALL_DATA) builtins.1 $(mandir)/bash_builtins.1
+! #       $(INSTALL_DATA) readline.3 $(man3dir)
+  	$(INSTALL_DATA) features.info $(infodir)/bash.info
+  
+  uninstall:
diff --git a/shells/bash/patches/patch-ae b/shells/bash/patches/patch-ae
new file mode 100644
index 00000000000..ec58ff4ae41
--- /dev/null
+++ b/shells/bash/patches/patch-ae
@@ -0,0 +1,17 @@
+*** documentation/builtins.1.bak	Sat Sep 18 00:06:53 1993
+--- documentation/builtins.1	Wed Oct  4 23:29:49 1995
+***************
+*** 10,15 ****
+  unset, until, wait, while \- bash built-in commands, see \fBbash\fR(1)
+  .SH BASH BUILTIN COMMANDS
+  .nr zZ 1
+! .so bash.1
+  .SH SEE ALSO
+  bash(1), sh(1)
+--- 10,15 ----
+  unset, until, wait, while \- bash built-in commands, see \fBbash\fR(1)
+  .SH BASH BUILTIN COMMANDS
+  .nr zZ 1
+! .so man1/bash.1
+  .SH SEE ALSO
+  bash(1), sh(1)
diff --git a/shells/bash/patches/patch-ag b/shells/bash/patches/patch-ag
new file mode 100644
index 00000000000..56b74093c82
--- /dev/null
+++ b/shells/bash/patches/patch-ag
@@ -0,0 +1,13 @@
+--- documentation/features.texi.orig	Fri Aug  5 04:26:21 1994
++++ documentation/features.texi	Mon Jun 16 19:16:56 1997
+@@ -2,6 +2,10 @@
+ @c %**start of header
+ @setfilename features.info
+ @settitle Bash Features
++@dircategory Shells
++@direntry
++* Bash: (bash).                 GNU Bourne-Again SHell.
++@end direntry
+ @c %**end of header
+ 
+ @ignore
diff --git a/shells/bash/patches/patch-ah b/shells/bash/patches/patch-ah
new file mode 100644
index 00000000000..14fcc43adb8
--- /dev/null
+++ b/shells/bash/patches/patch-ah
@@ -0,0 +1,19 @@
+*** machines.h.orig	Fri Jun 27 10:54:20 1997
+--- machines.h	Fri Jun 27 10:54:22 1997
+***************
+*** 63,69 ****
+     some machines, our malloc () cannot be used (because of library
+     conflicts, for example), and for those, you should specifically
+     #undef USE_GNU_MALLOC in the machine description. */
+! #define USE_GNU_MALLOC
+  
+  /* This causes the Gnu malloc library (from glibc) to be used. */
+  /* #define USE_GNU_MALLOC_LIBRARY */
+--- 63,69 ----
+     some machines, our malloc () cannot be used (because of library
+     conflicts, for example), and for those, you should specifically
+     #undef USE_GNU_MALLOC in the machine description. */
+! #undef USE_GNU_MALLOC
+  
+  /* This causes the Gnu malloc library (from glibc) to be used. */
+  /* #define USE_GNU_MALLOC_LIBRARY */
diff --git a/shells/bash/pkg/COMMENT b/shells/bash/pkg/COMMENT
new file mode 100644
index 00000000000..00c70ad756d
--- /dev/null
+++ b/shells/bash/pkg/COMMENT
@@ -0,0 +1 @@
+The GNU Borne Again Shell.
diff --git a/shells/bash/pkg/DESCR b/shells/bash/pkg/DESCR
new file mode 100644
index 00000000000..497fcff47de
--- /dev/null
+++ b/shells/bash/pkg/DESCR
@@ -0,0 +1,8 @@
+Bash is the GNU Project's Bourne
+Again SHell, an interactive shell with Bourne shell syntax (/bin/sh);
+but also with interactive command line editing, job control on
+architectures that support it, Csh-like history features and brace
+expansion, and a slew of other stuff.  For more information on the
+features of Bash that are new to this type of shell, see the file
+`documentation/features.texi'.  There is also a processed DVI file
+there, as well as a large man page.
diff --git a/shells/bash/pkg/PLIST b/shells/bash/pkg/PLIST
new file mode 100644
index 00000000000..cf0d01fa463
--- /dev/null
+++ b/shells/bash/pkg/PLIST
@@ -0,0 +1,10 @@
+bin/bash
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
+@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
+bin/bashbug
+man/man1/bash.1
+man/man1/bash_builtins.1
+@unexec install-info --delete %D/info/bash.info %D/info/dir
+info/bash.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/bash.info %D/info/dir
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
new file mode 100644
index 00000000000..59648551994
--- /dev/null
+++ b/shells/bash2/Makefile
@@ -0,0 +1,52 @@
+# New ports collection makefile for:	bash
+# Version required:     2.01
+# Date created:		21 August 1994
+# Whom:			jkh
+#
+# $OpenBSD: Makefile,v 1.1.1.1 1997/11/18 01:20:02 gene Exp $
+# Id: Makefile,v 1.26 1997/06/27 23:03:27 ache Exp $
+#
+
+DISTNAME=       bash-2.01
+CATEGORIES=	shells
+MASTER_SITES=	ftp://slc2.ins.cwru.edu/pub/dist/  \
+		${MASTER_SITE_GNU}
+.if !defined(NOPORTDOCS)
+DISTFILES=      bash-2.01.tar.gz bash-doc-2.01.tar.gz
+.endif
+
+MAINTAINER=	gene@OpenBSD.ORG
+
+GNU_CONFIGURE=	Yes
+MAN1=		bash.1 bashbug.1
+
+post-patch:
+	cp /usr/include/fnmatch.h ${WRKSRC}/lib/glob/fnmatch.h
+
+pre-install:
+	if [ ! -s ${PREFIX}/info/dir ]; then \
+	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+
+post-install:
+	${CP} /etc/shells /etc/shells.bak
+	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; echo ${PREFIX}/bin/bash) >/etc/shells
+	${RM} /etc/shells.bak
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/bash
+	${INSTALL_MAN}  \
+		${WRKDIR}/bash-doc-2.01/doc/article.ps  \
+		${WRKDIR}/bash-doc-2.01/doc/bashref.ps  \
+		${PREFIX}/share/doc/bash
+	${INSTALL_MAN}  \
+		${WRKDIR}/bash-doc-2.01/doc/bash.html  \
+		${WRKDIR}/bash-doc-2.01/doc/bashref.html  \
+		${WRKDIR}/bash-doc-2.01/doc/bashref_toc.html  \
+		${PREFIX}/share/doc/bash
+	${INSTALL_MAN}  \
+		${WRKDIR}/bash-doc-2.01/doc/article.txt  \
+		${PREFIX}/share/doc/bash
+	${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
+.endif
+
+.include <bsd.port.mk>
diff --git a/shells/bash2/files/md5 b/shells/bash2/files/md5
new file mode 100644
index 00000000000..79d2c265685
--- /dev/null
+++ b/shells/bash2/files/md5
@@ -0,0 +1,2 @@
+MD5 (bash-2.01.tar.gz) = 51837bb4662144b64bd874585c057752
+MD5 (bash-doc-2.01.tar.gz) = 5f2f59032f9dd63dde0e464af5b5346c
diff --git a/shells/bash2/patches/patch-aa b/shells/bash2/patches/patch-aa
new file mode 100644
index 00000000000..16d0302deba
--- /dev/null
+++ b/shells/bash2/patches/patch-aa
@@ -0,0 +1,21 @@
+*** doc/Makefile.in.bak	Fri Jan 31 00:12:33 1997
+--- doc/Makefile.in	Sat Jun 28 02:23:01 1997
+***************
+*** 155,161 ****
+  	-$(INSTALL_DATA) $(srcdir)/bashref.info $(infodir)/bash.info
+  # run install-info if it is present to update the info directory
+  	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+! 		install-info --dir-file=$(infodir)/dir $(infodir)/bash.info; \
+  	else true; fi
+  
+  uninstall:
+--- 155,163 ----
+  	-$(INSTALL_DATA) $(srcdir)/bashref.info $(infodir)/bash.info
+  # run install-info if it is present to update the info directory
+  	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+! 		install-info \
+! 		--defentry="* BASH: (bash).                 Bash Reference Manual." \
+! 		--dir-file=$(infodir)/dir $(infodir)/bash.info; \
+  	else true; fi
+  
+  uninstall:
diff --git a/shells/bash2/patches/patch-ab b/shells/bash2/patches/patch-ab
new file mode 100644
index 00000000000..46c5e4f858c
--- /dev/null
+++ b/shells/bash2/patches/patch-ab
@@ -0,0 +1,19 @@
+*** Makefile.in.bak	Wed Dec 18 22:57:21 1996
+--- Makefile.in	Fri Dec 27 14:20:11 1996
+***************
+*** 499,505 ****
+  
+  install:	.made installdirs
+  	$(INSTALL_PROGRAM) $(Program) $(bindir)/$(Program)
+! 	$(INSTALL_PROGRAM) bashbug $(bindir)/bashbug
+  	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
+  		man1dir=$(man1dir) man1ext=$(man1ext) \
+  		man3dir=$(man3dir) man3ext=$(man3ext) \
+--- 499,505 ----
+  
+  install:	.made installdirs
+  	$(INSTALL_PROGRAM) $(Program) $(bindir)/$(Program)
+! 	$(INSTALL) -m 555 bashbug $(bindir)/bashbug
+  	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
+  		man1dir=$(man1dir) man1ext=$(man1ext) \
+  		man3dir=$(man3dir) man3ext=$(man3ext) \
diff --git a/shells/bash2/patches/patch-ac b/shells/bash2/patches/patch-ac
new file mode 100644
index 00000000000..69790098164
--- /dev/null
+++ b/shells/bash2/patches/patch-ac
@@ -0,0 +1,19 @@
+*** lib/glob/Makefile.in.orig	Fri Oct  4 19:02:34 1996
+--- lib/glob/Makefile.in	Tue May 27 01:48:43 1997
+***************
+*** 45,51 ****
+  # The header files for this library.
+  HSOURCES = $(srcdir)/fnmatch.h
+  
+! OBJECTS = glob.o fnmatch.o
+  
+  # The texinfo files which document this library.
+  DOCSOURCE = doc/glob.texi
+--- 45,51 ----
+  # The header files for this library.
+  HSOURCES = $(srcdir)/fnmatch.h
+  
+! OBJECTS = glob.o #fnmatch.o
+  
+  # The texinfo files which document this library.
+  DOCSOURCE = doc/glob.texi
diff --git a/shells/bash2/patches/patch-ae b/shells/bash2/patches/patch-ae
new file mode 100644
index 00000000000..d29f6b5493c
--- /dev/null
+++ b/shells/bash2/patches/patch-ae
@@ -0,0 +1,16 @@
+--- builtins/enable.def~        Wed Oct  2 13:47:05 1996
++++ builtins/enable.def Tue May  6 14:18:09 1997
+@@ -284,9 +284,10 @@
+       name = list->word->word;
+
+       size = strlen (name);
+-      struct_name = xmalloc (size + 8);
+-      strcpy (struct_name, name);
+-      strcpy (struct_name + size, "_struct");
++      struct_name = xmalloc (size + 9);
++      *struct_name = '_';
++      strcpy (struct_name + 1, name);
++      strcpy (struct_name + size + 1, "_struct");
+
+       b = (struct builtin *)dlsym (handle, struct_name);
+       if (b == 0)
diff --git a/shells/bash2/pkg/COMMENT b/shells/bash2/pkg/COMMENT
new file mode 100644
index 00000000000..00c70ad756d
--- /dev/null
+++ b/shells/bash2/pkg/COMMENT
@@ -0,0 +1 @@
+The GNU Borne Again Shell.
diff --git a/shells/bash2/pkg/DESCR b/shells/bash2/pkg/DESCR
new file mode 100644
index 00000000000..497fcff47de
--- /dev/null
+++ b/shells/bash2/pkg/DESCR
@@ -0,0 +1,8 @@
+Bash is the GNU Project's Bourne
+Again SHell, an interactive shell with Bourne shell syntax (/bin/sh);
+but also with interactive command line editing, job control on
+architectures that support it, Csh-like history features and brace
+expansion, and a slew of other stuff.  For more information on the
+features of Bash that are new to this type of shell, see the file
+`documentation/features.texi'.  There is also a processed DVI file
+there, as well as a large man page.
diff --git a/shells/bash2/pkg/PLIST b/shells/bash2/pkg/PLIST
new file mode 100644
index 00000000000..34e6a439bb6
--- /dev/null
+++ b/shells/bash2/pkg/PLIST
@@ -0,0 +1,13 @@
+bin/bash
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
+@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
+bin/bashbug
+man/man1/bash.1.gz
+man/man1/bashbug.1.gz
+info/bash.info
+share/doc/bash/article.ps.gz
+share/doc/bash/bashref.ps.gz
+share/doc/bash/bash.html
+share/doc/bash/bashref.html
+share/doc/bash/bashref_toc.html
+share/doc/bash/article.txt
diff --git a/shells/es/Makefile b/shells/es/Makefile
new file mode 100644
index 00000000000..2b59daa24b8
--- /dev/null
+++ b/shells/es/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    es
+# Version required:     0.9a1
+# Date created:         Sun Aug 13 12:36:14 CDT 1995
+# Whom:                 erich@rrnet.com
+#
+# $OpenBSD: Makefile,v 1.1.1.1 1997/11/18 01:20:02 gene Exp $
+# Id: Makefile,v 1.4 1996/11/18 11:39:46 asami Exp $
+#
+
+DISTNAME=       es-0.9-alpha1
+PKGNAME=	es-0.9a1
+CATEGORIES=	shells
+MASTER_SITES=   ftp://ftp.sys.toronto.edu/pub/es/
+
+MAINTAINER=	gene@OpenBSD.ORG
+
+.include <bsd.port.mk>
diff --git a/shells/es/files/md5 b/shells/es/files/md5
new file mode 100644
index 00000000000..cef218f706f
--- /dev/null
+++ b/shells/es/files/md5
@@ -0,0 +1 @@
+MD5 (es-0.9-alpha1.tar.gz) = 2e7372fc4c8eaeb00571e721730b6108
diff --git a/shells/es/patches/patch-aa b/shells/es/patches/patch-aa
new file mode 100644
index 00000000000..1f649e60e89
--- /dev/null
+++ b/shells/es/patches/patch-aa
@@ -0,0 +1,93 @@
+*** Makefile.orig	Tue May 30 06:14:14 1995
+--- Makefile	Fri Aug 11 16:02:11 1995
+***************
+*** 33,40 ****
+  SHELL	= /bin/sh
+  CC	= cc
+  #CC	= gcc
+! CFLAGS	= -g
+! #CFLAGS	= -g -O -Wall
+  LDFLAGS	=
+  LIBS	=
+  
+--- 33,40 ----
+  SHELL	= /bin/sh
+  CC	= cc
+  #CC	= gcc
+! #CFLAGS	= -g
+! CFLAGS	= -O2
+  LDFLAGS	=
+  LIBS	=
+  
+***************
+*** 52,57 ****
+--- 52,66 ----
+  	  tree.o util.o var.o vec.o version.o y.tab.o
+  OTHER	= Makefile parse.y mksignal
+  GEN	= esdump y.tab.c y.tab.h y.output token.h sigmsgs.c initial.c
++ 
++ all: es
++ 
++ install:
++ 	$(INSTALL) -c es $(PREFIX)/bin
++ 	$(INSTALL) -c esdebug $(PREFIX)/bin/esdebug
++ 	$(INSTALL) -c es.1 $(PREFIX)/man/man1
++ 	strip $(PREFIX)/bin/es
++ 	gzip -9nf $(PREFIX)/man/man1/es.1
+  
+  es	: ${OFILES} initial.o
+  	${CC} -o es ${LDFLAGS} ${OFILES} initial.o ${LIBS}
+--- prim-sys.c.orig	Tue May 30 06:13:51 1995
++++ prim-sys.c	Thu Apr 10 10:15:40 1997
+@@ -194,7 +194,7 @@
+ 
+ static void printlimit(const Limit *limit, Boolean hard) {
+ 	struct rlimit rlim;
+-	long lim;
++	u_quad_t lim;
+ 	getrlimit(limit->flag, &rlim);
+ 	if (hard)
+ 		lim = rlim.rlim_max;
+@@ -209,11 +209,11 @@
+ 				lim /= suf->amount;
+ 				break;
+ 			}
+-		print("%-8s\t%d%s\n", limit->name, lim, (suf == NULL || lim == 0) ? "" : suf->name);
++		print("%-8s\t%ud%s\n", limit->name, (unsigned int)lim, (suf == NULL || lim == 0) ? "" : suf->name);
+ 	}
+ }
+ 
+-static long parselimit(const Limit *limit, char *s) {
++static u_quad_t parselimit(const Limit *limit, char *s) {
+ 	long lim;
+ 	char *t;
+ 	const Suffix *suf = limit->suffix;
+--- main.c~	Tue May 30 06:13:50 1995
++++ main.c	Thu Apr 10 09:20:49 1997
+@@ -9,7 +9,7 @@
+ Boolean gcinfo		= FALSE;	/* -I */
+ #endif
+ 
+-#if !HPUX && !defined(linux)
++#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ extern int getopt (int argc, char **argv, const char *optstring);
+ #endif
+ extern int optind;
+--- stdenv.h~	Tue May 30 06:13:53 1995
++++ stdenv.h	Thu Apr 10 09:32:22 1997
+@@ -283,6 +283,7 @@
+ 
+ /* stdlib */
+ 
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ extern noreturn exit(int);
+ extern noreturn abort(void);
+ extern long strtol(const char *num, char **end, int base);
+@@ -290,6 +291,7 @@
+ 	void *base, size_t nmemb, size_t size,
+ 	int (*compar)(const void *, const void *)
+ );
++#endif
+ 
+ /* setjmp */
+ 
diff --git a/shells/es/pkg/COMMENT b/shells/es/pkg/COMMENT
new file mode 100644
index 00000000000..b62d029d1b5
--- /dev/null
+++ b/shells/es/pkg/COMMENT
@@ -0,0 +1 @@
+An extensible shell, derived from plan9's rc
diff --git a/shells/es/pkg/DESCR b/shells/es/pkg/DESCR
new file mode 100644
index 00000000000..6b6cdba3348
--- /dev/null
+++ b/shells/es/pkg/DESCR
@@ -0,0 +1,13 @@
+Es is an extensible shell.  The language was derived from the Plan 9
+shell, rc, and was influenced by functional programming languages,
+such as Scheme, and the Tcl embeddable programming language.  This
+implementation is derived from Byron Rakitzis's public domain
+implementation of rc.
+
+Es is in the public domain.  We hold no copyrights or patents on
+the source code, and do not place any restrictions on its distribution.
+We would appreciate it if any distributions do credit the authors.
+
+Enjoy!
+
+-- Paul Haahr & Byron Rakitzis
diff --git a/shells/es/pkg/PLIST b/shells/es/pkg/PLIST
new file mode 100644
index 00000000000..03aafe9fe6b
--- /dev/null
+++ b/shells/es/pkg/PLIST
@@ -0,0 +1,3 @@
+bin/es
+bin/esdebug
+man/man1/es.1.gz
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
new file mode 100644
index 00000000000..1e7d8d0b462
--- /dev/null
+++ b/shells/pdksh/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	pdksh
+# Version required:	5.2.12
+# Date created:		23 May 1995
+# Whom:			thomas@ghpc8.ihf.rwth-aachen.de
+#
+# $OpenBSD: Makefile,v 1.1.1.1 1997/11/18 01:20:00 gene Exp $
+# Id: Makefile,v 1.16 1996/11/18 11:39:51 asami Exp $
+#
+
+DISTNAME=	pdksh-5.2.12
+CATEGORIES=	shells
+MASTER_SITES=	ftp://ftp.cs.mun.ca/pub/pdksh/
+
+MAINTAINER=	gene@OpenBSD.ORG
+
+GNU_CONFIGURE=  yes
+MAN1=		ksh.1
+
+.include <bsd.port.mk>
diff --git a/shells/pdksh/files/md5 b/shells/pdksh/files/md5
new file mode 100644
index 00000000000..63174a55f33
--- /dev/null
+++ b/shells/pdksh/files/md5
@@ -0,0 +1 @@
+MD5 (pdksh-5.2.12.tar.gz) = b622d7b961dbb6dc9cccd237a68ff151
diff --git a/shells/pdksh/patches/patch-aa b/shells/pdksh/patches/patch-aa
new file mode 100644
index 00000000000..e1d901494bd
--- /dev/null
+++ b/shells/pdksh/patches/patch-aa
@@ -0,0 +1,13 @@
+--- main.c.orig	Fri Sep 20 20:15:03 1996
++++ main.c	Tue Oct 29 19:20:24 1996
+@@ -482,9 +482,9 @@
+ 	s->u.shf = shf;
+ 	s->file = str_save(name, ATEMP);
+ 	i = shell(s, FALSE);
+-	quitenv();
+ 	source = sold;
+ 	shf_close(s->u.shf);
++	quitenv();
+ 	if (old_argv) {
+ 		e->loc->argv = old_argv;
+ 		e->loc->argc = old_argc;
diff --git a/shells/pdksh/pkg/COMMENT b/shells/pdksh/pkg/COMMENT
new file mode 100644
index 00000000000..509256401a8
--- /dev/null
+++ b/shells/pdksh/pkg/COMMENT
@@ -0,0 +1 @@
+The Public Domain Korn Shell.
diff --git a/shells/pdksh/pkg/DESCR b/shells/pdksh/pkg/DESCR
new file mode 100644
index 00000000000..64514d922a8
--- /dev/null
+++ b/shells/pdksh/pkg/DESCR
@@ -0,0 +1,2 @@
+PDKSH is the Public Domain Korn Shell. Its command language is a
+superset of the sh(1) shell language.
diff --git a/shells/pdksh/pkg/PLIST b/shells/pdksh/pkg/PLIST
new file mode 100644
index 00000000000..651cadf8359
--- /dev/null
+++ b/shells/pdksh/pkg/PLIST
@@ -0,0 +1,4 @@
+bin/ksh
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
+@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
+man/man1/ksh.1.gz
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
new file mode 100644
index 00000000000..12f48ceec2c
--- /dev/null
+++ b/shells/scsh/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:    scsh
+# Version required:     0.5.1
+# Date created:         Jul, 15, 1997
+# Whom:                 cracauer@cons.org "Martin Cracauer"
+#
+# $OpenBSD: Makefile,v 1.1.1.1 1997/11/18 01:20:01 gene Exp $
+# Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp $
+#
+
+DISTNAME=	scsh-0.5.1
+CATEGORIES=	shells lang
+MASTER_SITES=	ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/
+
+MAINTAINER= 	cracauer@cons.org
+
+GNU_CONFIGURE=	yes
+
+ALL_TARGET=	enough
+MAN1=		scsh.1
+STRIP=
+
+post-install:
+	@strip ${PREFIX}/bin/scsh
+	(cd ${WRKSRC} ; \
+	 ${INSTALL_DATA} README RELEASE NEWS COPYING ${PREFIX}/lib/scsh/doc)
+	${RM} -f ${PREFIX}/share/doc/scsh
+	ln -fs ${PREFIX}/lib/scsh/doc ${PREFIX}/share/doc/scsh
+
+.include <bsd.port.mk>
diff --git a/shells/scsh/files/md5 b/shells/scsh/files/md5
new file mode 100644
index 00000000000..4c2cef40d02
--- /dev/null
+++ b/shells/scsh/files/md5
@@ -0,0 +1 @@
+MD5 (scsh-0.5.1.tar.gz) = 907dfc1202bff6b4aa416d2026dbdd19
diff --git a/shells/scsh/patches/patch-aa b/shells/scsh/patches/patch-aa
new file mode 100644
index 00000000000..22f97bee64e
--- /dev/null
+++ b/shells/scsh/patches/patch-aa
@@ -0,0 +1,39 @@
+*** Makefile.in.original	Tue Nov 26 14:44:19 1996
+--- Makefile.in	Thu Nov 28 15:29:24 1996
+***************
+*** 137,143 ****
+  
+  # The following is the first rule and therefore the "make" command's
+  # default target.
+! enough: $(VM) $(IMAGE) script $(LIBCIG) scsh $(LIBSCSH) $(MANPAGE) .notify
+  
+  # The developers are curious to know.  Don't be concerned if this fails.
+  # You may comment these lines out if you wish to be discourteous.
+--- 137,143 ----
+  
+  # The following is the first rule and therefore the "make" command's
+  # default target.
+! enough: $(VM) $(IMAGE) script $(LIBCIG) scsh $(LIBSCSH) $(MANPAGE)
+  
+  # The developers are curious to know.  Don't be concerned if this fails.
+  # You may comment these lines out if you wish to be discourteous.
+***************
+*** 250,255 ****
+--- 250,256 ----
+  	$(RM) -r $(LIB).old
+  	if [ -d $(LIB) ] ; then mv $(LIB) $(LIB).old ; fi
+  	mkdir $(LIB)
++ 	mkdir $(LIB)/emacs
+  	mkdir $(LIB)/big
+  	mkdir $(LIB)/cig
+  	mkdir $(LIB)/doc
+***************
+*** 286,291 ****
+--- 287,293 ----
+  	      $(LIB)/misc $(LIB)/link $(LIB)/vm $(LIB)/doc
+  	for f in $(srcdir)/rts/*num.scm; \
+  	    do $(INSTALL_DATA) $$f $(LIB)/rts/; done
++ 	for f in $(srcdir)/emacs/*; do $(INSTALL_DATA) $$f $(LIB)/emacs/; done
+  	for f in $(srcdir)/env/*.scm; do $(INSTALL_DATA) $$f $(LIB)/env/; done
+  	for f in $(srcdir)/big/*.scm; do $(INSTALL_DATA) $$f $(LIB)/big/; done
+  	for f in $(srcdir)/opt/*.scm; do $(INSTALL_DATA) $$f $(LIB)/opt/; done
diff --git a/shells/scsh/patches/patch-ab b/shells/scsh/patches/patch-ab
new file mode 100644
index 00000000000..a75d1e93ac4
--- /dev/null
+++ b/shells/scsh/patches/patch-ab
@@ -0,0 +1,19 @@
+*** env/command.scm.original    Tue Nov 26 15:59:38 1996
+--- env/command.scm     Tue Nov 26 15:59:46 1996
+***************
+*** 546,552 ****
+                ((char=? (string-ref line 0) #\n) #f)
+                (else (loop count)))))))
+  
+! (define *y-or-n-eof-count* 100)
+  
+  (define (read-line port)
+    (let loop ((l '()))
+--- 546,552 ----
+                ((char=? (string-ref line 0) #\n) #f)
+                (else (loop count)))))))
+  
+! (define *y-or-n-eof-count* 0)
+  
+  (define (read-line port)
+    (let loop ((l '()))
diff --git a/shells/scsh/patches/patch-ac b/shells/scsh/patches/patch-ac
new file mode 100644
index 00000000000..42c68f84ede
--- /dev/null
+++ b/shells/scsh/patches/patch-ac
@@ -0,0 +1,19 @@
+*** configure.in.original       Tue Nov 26 17:10:41 1996
+--- configure.in        Tue Nov 26 17:11:07 1996
+***************
+*** 220,226 ****
+  fi
+
+  AR=${AR-"ar cq"}
+! TMPDIR=${TMPDIR-"/usr/tmp"}
+
+  case "$host" in
+
+--- 220,226 ----
+  fi
+
+  AR=${AR-"ar cq"}
+! TMPDIR=${TMPDIR-"/var/tmp"}
+
+  case "$host" in
+
diff --git a/shells/scsh/patches/patch-ad b/shells/scsh/patches/patch-ad
new file mode 100644
index 00000000000..57efb8d7d37
--- /dev/null
+++ b/shells/scsh/patches/patch-ad
@@ -0,0 +1,19 @@
+*** configure.original  Tue Nov 26 17:55:51 1996
+--- configure   Tue Nov 26 17:55:58 1996
+***************
+*** 1017,1023 ****
+  fi
+
+  AR=${AR-"ar cq"}
+! TMPDIR=${TMPDIR-"/usr/tmp"}
+
+  case "$host" in
+
+--- 1017,1023 ----
+  fi
+
+  AR=${AR-"ar cq"}
+! TMPDIR=${TMPDIR-"/var/tmp"}
+
+  case "$host" in
+
diff --git a/shells/scsh/patches/patch-ae b/shells/scsh/patches/patch-ae
new file mode 100644
index 00000000000..f7eec1bab76
--- /dev/null
+++ b/shells/scsh/patches/patch-ae
@@ -0,0 +1,19 @@
+*** scsh/scsh.scm.original   Tue Nov 26 17:15:00 1996
+--- scsh/scsh.scm    Tue Nov 26 17:15:06 1996
+***************
+*** 298,304 ****
+               (list (string-append (car maybe-prefix) ".~a"))))))
+
+  (define *temp-file-template*
+!   (make-fluid (string-append "/usr/tmp/" (number->string (pid)) ".~a")))
+
+
+  (define (temp-file-iterate maker . maybe-template)
+--- 298,304 ----
+               (list (string-append (car maybe-prefix) ".~a"))))))
+
+  (define *temp-file-template*
+!   (make-fluid (string-append "/var/tmp/" (number->string (pid)) ".~a")))
+
+
+  (define (temp-file-iterate maker . maybe-template)
diff --git a/shells/scsh/patches/patch-af b/shells/scsh/patches/patch-af
new file mode 100644
index 00000000000..585664760f7
--- /dev/null
+++ b/shells/scsh/patches/patch-af
@@ -0,0 +1,85 @@
+*** config.guess.orig	Fri Sep 26 19:31:53 1997
+--- config.guess	Fri Sep 26 19:31:57 1997
+***************
+*** 67,72 ****
+--- 67,75 ----
+      amiga:NetBSD:*:*)
+        echo m68k-cbm-netbsd${UNAME_RELEASE}
+        exit 0 ;;
++     amiga:OpenBSD:*:*)
++       echo m68k-cbm-openbsd${UNAME_RELEASE}
++       exit 0 ;;
+      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+  	echo arm-acorn-riscix${UNAME_RELEASE}
+  	exit 0;;
+***************
+*** 104,115 ****
+--- 107,127 ----
+      atari*:NetBSD:*:*)
+  	echo m68k-atari-netbsd${UNAME_RELEASE}
+  	exit 0 ;;
++     atari*:OpenBSD:*:*)
++ 	echo m68k-atari-openbsd${UNAME_RELEASE}
++ 	exit 0 ;;
+      sun3*:NetBSD:*:*)
+  	echo m68k-sun-netbsd${UNAME_RELEASE}
+  	exit 0 ;;
++     sun3*:OpenBSD:*:*)
++ 	echo m68k-sun-openbsd${UNAME_RELEASE}
++ 	exit 0 ;;
+      mac68k:NetBSD:*:*)
+  	echo m68k-apple-netbsd${UNAME_RELEASE}
+  	exit 0 ;;
++     mac68k:OpenBSD:*:*)
++ 	echo m68k-apple-openbsd${UNAME_RELEASE}
++ 	exit 0 ;;
+      RISC*:ULTRIX:*:*)
+  	echo mips-dec-ultrix${UNAME_RELEASE}
+  	exit 0 ;;
+***************
+*** 313,318 ****
+--- 325,333 ----
+      hp3[0-9][05]:NetBSD:*:*)
+  	echo m68k-hp-netbsd${UNAME_RELEASE}
+  	exit 0 ;;
++     hp3[0-9][05]:OpenBSD:*:*)
++ 	echo m68k-hp-openbsd${UNAME_RELEASE}
++ 	exit 0 ;;
+      i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
+  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+  	exit 0 ;;
+***************
+*** 321,326 ****
+--- 336,344 ----
+  	exit 0 ;;
+      *:NetBSD:*:*)
+  	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++ 	exit 0 ;;
++     *:OpenBSD:*:*)
++ 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+  	exit 0 ;;
+      i*:CYGWIN*:*)
+  	echo i386-pc-cygwin32
+*** config.sub.orig	Fri Sep 26 20:00:51 1997
+--- config.sub	Fri Sep 26 20:01:43 1997
+***************
+*** 678,686 ****
+  	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
+  	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
+  	      | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+! 	      | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
+! 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+! 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+  	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* \
+  	      | -linux-gnu*)
+--- 678,686 ----
+  	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
+  	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
+  	      | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+! 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* \
+! 	      | -riscix* | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* \
+! 	      | -elf* | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+  	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* \
+  	      | -linux-gnu*)
diff --git a/shells/scsh/patches/patch-ag b/shells/scsh/patches/patch-ag
new file mode 100644
index 00000000000..51b6a9e40bb
--- /dev/null
+++ b/shells/scsh/patches/patch-ag
@@ -0,0 +1,19 @@
+*** dynload.c.orig	Fri Sep 26 21:18:21 1997
+--- dynload.c	Fri Sep 26 21:36:11 1997
+***************
+*** 36,42 ****
+  #include <dlfcn.h>
+  #endif
+  
+! #ifdef HAVE_LIBGEN_H
+  #include <libgen.h>
+  /* if we have pathfind, get the file name with $LD_LIBRARY_PATH or $S48_EXTERN_PATH */
+  static char *shared_object_name(char *name)
+--- 36,43 ----
+  #include <dlfcn.h>
+  #endif
+  
+! #if defined(HAVE_LIBGEN_H) && !defined(__OpenBSD__)
+  #include <libgen.h>
+  /* if we have pathfind, get the file name with $LD_LIBRARY_PATH or $S48_EXTERN_PATH */
+  static char *shared_object_name(char *name)
diff --git a/shells/scsh/pkg/COMMENT b/shells/scsh/pkg/COMMENT
new file mode 100644
index 00000000000..30452371478
--- /dev/null
+++ b/shells/scsh/pkg/COMMENT
@@ -0,0 +1 @@
+A Unix shell embedded into Scheme, with access to all Posix calls
diff --git a/shells/scsh/pkg/DESCR b/shells/scsh/pkg/DESCR
new file mode 100644
index 00000000000..7df558d870d
--- /dev/null
+++ b/shells/scsh/pkg/DESCR
@@ -0,0 +1,48 @@
+Scsh is a Unix shell in that is has significant syntax extensions to
+make writing Unix shell scripts easy (constructing pipelines, setting
+I/O redirection, conditional execution etc.). It also offers access to
+lower-level functionality like all Posix system calls, TCP/IP sockets
+and a full-featured regular expression library. This is embedded into
+a general-purpose programming language with real data types,
+extensive, syntactically clean control constructs and "real" quoting
+rules.
+
+Scsh is also a full implementation of R4RS Scheme with some
+non-standard behavior (required for scripting). As a result, a wide
+varity of exiting Scheme code can be used.
+
+The underlying Scheme implementation is a virtual machine for compact
+byte code.
+
+The name of the installed program is "scsh", the manpage is scsh(1),
+other documentation is in (/usr/local/)lib/scsh/doc
+
+To load slib, install slib into /usr/local/lib/slib and run 
+(load "slib-init.scm") 
+in scsh. It requires no additional setup (paths or such).
+
+The emacs interface is in the original distribution in emacs/. For
+documentation see doc/user-guide.txt.
+
+Differences between FreeBSD port and generic scsh release:
+----------------------------------------------------------
+
+1) When hitting C-d (end-of-file), scsh asks 100 times for
+confirmation. I changed the default to do this just once. See constant
+*y-or-n-eof-count* in scsh/rw.scm to change it.
+
+2) The original scsh sends a mail to the scsh authors every time you
+make the package. The FreeBSD port doesn't. The authors of scsh would
+appreciate it if you do a `(cd work/scsh-0.4.4 && make .notify)` after
+you build this package.
+
+3) A symbolic link ${PREFIX}/share/doc/scsh to the documentation is
+created.
+
+4) Some basic description text files from the distribution base dir
+are copied to lib/doc. The emacs directory is copied into
+lib/scsh/emacs. scsh's default is not to install these files.
+
+5) Some /usr/tmp -> /var/tmp
+
+Martin Cracauer <cracauer@cons.org>
diff --git a/shells/scsh/pkg/PLIST b/shells/scsh/pkg/PLIST
new file mode 100644
index 00000000000..f7769fa7c06
--- /dev/null
+++ b/shells/scsh/pkg/PLIST
@@ -0,0 +1,240 @@
+bin/scsh
+man/man1/scsh.1.gz
+lib/scsh/big/array.scm
+lib/scsh/big/big-util.scm
+lib/scsh/big/bigbit.scm
+lib/scsh/big/compose-cont.scm
+lib/scsh/big/defrecord.scm
+lib/scsh/big/destructure.scm
+lib/scsh/big/dump.scm
+lib/scsh/big/external.scm
+lib/scsh/big/filename.scm
+lib/scsh/big/format.scm
+lib/scsh/big/general-table.scm
+lib/scsh/big/lu-decomp.scm
+lib/scsh/big/new-ports.scm
+lib/scsh/big/pp.scm
+lib/scsh/big/queue.scm
+lib/scsh/big/random.scm
+lib/scsh/big/receive.scm
+lib/scsh/big/search-tree.scm
+lib/scsh/big/sleep.scm
+lib/scsh/big/sort.scm
+lib/scsh/big/thread.scm
+lib/scsh/big/xport.scm
+lib/scsh/cig/cig
+lib/scsh/cig/cig.image
+lib/scsh/cig/libscshvm.a
+lib/scsh/cig/libcig.h
+lib/scsh/doc/COPYING
+lib/scsh/doc/NEWS
+lib/scsh/doc/RELEASE
+lib/scsh/doc/README
+lib/scsh/doc/scsh-manual/awk.tex
+lib/scsh/doc/scsh-manual/changes.tex
+lib/scsh/doc/scsh-manual/decls.tex
+lib/scsh/doc/scsh-manual/front.tex
+lib/scsh/doc/scsh-manual/intro.tex
+lib/scsh/doc/scsh-manual/man.tex
+lib/scsh/doc/scsh-manual/miscprocs.tex
+lib/scsh/doc/scsh-manual/network.tex
+lib/scsh/doc/scsh-manual/procnotation.tex
+lib/scsh/doc/scsh-manual/rdelim.tex
+lib/scsh/doc/scsh-manual/running.tex
+lib/scsh/doc/scsh-manual/strings.tex
+lib/scsh/doc/scsh-manual/syscalls.tex
+lib/scsh/doc/scsh-manual/test.tex
+lib/scsh/doc/scsh-manual/todo.tex
+lib/scsh/doc/scsh-manual/tty.tex
+lib/scsh/doc/scsh-manual/xman.tex
+lib/scsh/doc/big-scheme.txt
+lib/scsh/doc/call-back.txt
+lib/scsh/doc/cheat.txt
+lib/scsh/doc/external.txt
+lib/scsh/doc/hacking.txt
+lib/scsh/doc/install.s48-0.36.txt
+lib/scsh/doc/install.txt
+lib/scsh/doc/no-leaf-env.txt
+lib/scsh/doc/olins-changes.txt
+lib/scsh/doc/package.txt
+lib/scsh/doc/scsh-src-roadmap.txt
+lib/scsh/doc/threads.txt
+lib/scsh/doc/type.txt
+lib/scsh/doc/user-guide.txt
+lib/scsh/doc/code.tex
+lib/scsh/doc/latex-stuff.tex
+lib/scsh/doc/meeting.tex
+lib/scsh/doc/module.tex
+lib/scsh/doc/scsh-paper.tex
+lib/scsh/doc/summary.tex
+lib/scsh/doc/meeting.ps
+lib/scsh/doc/module.ps
+lib/scsh/doc/scsh-manual.ps
+lib/scsh/doc/scsh-paper.ps
+lib/scsh/env/assem.scm
+lib/scsh/env/basic-command.scm
+lib/scsh/env/build.scm
+lib/scsh/env/command.scm
+lib/scsh/env/debug.scm
+lib/scsh/env/debuginfo.scm
+lib/scsh/env/disasm.scm
+lib/scsh/env/disclosers.scm
+lib/scsh/env/dispcond.scm
+lib/scsh/env/flatload.scm
+lib/scsh/env/init-defpackage.scm
+lib/scsh/env/inspect.scm
+lib/scsh/env/jar-assem.scm
+lib/scsh/env/list-interface.scm
+lib/scsh/env/load-package.scm
+lib/scsh/env/more-thread.scm
+lib/scsh/env/pacman.scm
+lib/scsh/env/pedit.scm
+lib/scsh/env/read-command.scm
+lib/scsh/env/shadow.scm
+lib/scsh/env/space.scm
+lib/scsh/env/start.scm
+lib/scsh/env/traverse.scm
+lib/scsh/env/version-info.scm
+lib/scsh/link/data.scm
+lib/scsh/link/generate-c-header.scm
+lib/scsh/link/link.scm
+lib/scsh/link/loadc.scm
+lib/scsh/link/reify.scm
+lib/scsh/link/transport.scm
+lib/scsh/link/write-image.scm
+lib/scsh/misc/annotate.scm
+lib/scsh/misc/argument.scm
+lib/scsh/misc/doodl.scm
+lib/scsh/misc/either.scm
+lib/scsh/misc/getenv.scm
+lib/scsh/misc/hilbert.scm
+lib/scsh/misc/ilength.scm
+lib/scsh/misc/integertostring.scm
+lib/scsh/misc/load-static.scm
+lib/scsh/misc/mail.scm
+lib/scsh/misc/packages.scm
+lib/scsh/misc/psd-s48.scm
+lib/scsh/misc/remote.scm
+lib/scsh/misc/require.scm
+lib/scsh/misc/separate.scm
+lib/scsh/misc/shift-reset.scm
+lib/scsh/misc/sicp.scm
+lib/scsh/misc/slib-init.scm
+lib/scsh/misc/socket.scm
+lib/scsh/misc/static.scm
+lib/scsh/misc/test-doodl.scm
+lib/scsh/opt/analyze.scm
+lib/scsh/opt/expand.scm
+lib/scsh/opt/inline.scm
+lib/scsh/opt/tst.scm
+lib/scsh/scsh/awk.scm
+lib/scsh/scsh/char-set.scm
+lib/scsh/scsh/db.scm
+lib/scsh/scsh/dbm.scm
+lib/scsh/scsh/defrec.scm
+lib/scsh/scsh/ekko.scm
+lib/scsh/scsh/endian.scm
+lib/scsh/scsh/enumconst.scm
+lib/scsh/scsh/fdports.scm
+lib/scsh/scsh/fileinfo.scm
+lib/scsh/scsh/filemtch.scm
+lib/scsh/scsh/filesys.scm
+lib/scsh/scsh/flock.scm
+lib/scsh/scsh/fname.scm
+lib/scsh/scsh/fr.scm
+lib/scsh/scsh/glob.scm
+lib/scsh/scsh/here.scm
+lib/scsh/scsh/jcontrol.scm
+lib/scsh/scsh/jcontrol2.scm
+lib/scsh/scsh/let-opt.scm
+lib/scsh/scsh/meta-arg.scm
+lib/scsh/scsh/ndbm.scm
+lib/scsh/scsh/network.scm
+lib/scsh/scsh/pty.scm
+lib/scsh/scsh/newports.scm
+lib/scsh/scsh/oldtop.scm
+lib/scsh/scsh/procobj.scm
+lib/scsh/scsh/rdelim.scm
+lib/scsh/scsh/re.scm
+lib/scsh/scsh/rw.scm
+lib/scsh/scsh/scsh-condition.scm
+lib/scsh/scsh/scsh-interfaces.scm
+lib/scsh/scsh/scsh-package.scm
+lib/scsh/scsh/scsh-read.scm
+lib/scsh/scsh/scsh-version.scm
+lib/scsh/scsh/scsh.scm
+lib/scsh/scsh/select.scm
+lib/scsh/scsh/sighandlers.scm
+lib/scsh/scsh/startup.scm
+lib/scsh/scsh/static.scm
+lib/scsh/scsh/stringcoll.scm
+lib/scsh/scsh/syntax-helpers.scm
+lib/scsh/scsh/syntax.scm
+lib/scsh/scsh/syscalls.scm
+lib/scsh/scsh/time.scm
+lib/scsh/scsh/top.scm
+lib/scsh/scsh/tty.scm
+lib/scsh/scsh/utilities.scm
+lib/scsh/rts/bignum.scm
+lib/scsh/rts/defenum.scm
+lib/scsh/rts/enum.scm
+lib/scsh/rts/floatnum.scm
+lib/scsh/rts/innum.scm
+lib/scsh/rts/ratnum.scm
+lib/scsh/rts/recnum.scm
+lib/scsh/rts/xnum.scm
+lib/scsh/rts/jar-defrecord.scm
+lib/scsh/vm/arch.scm
+lib/scsh/vm/arith.scm
+lib/scsh/vm/data.scm
+lib/scsh/vm/defenum.scm
+lib/scsh/vm/define-primitive.scm
+lib/scsh/vm/disasm.scm
+lib/scsh/vm/env.scm
+lib/scsh/vm/external.scm
+lib/scsh/vm/gc.scm
+lib/scsh/vm/heap.scm
+lib/scsh/vm/interfaces.scm
+lib/scsh/vm/interp.scm
+lib/scsh/vm/macro-package-defs.scm
+lib/scsh/vm/memory.scm
+lib/scsh/vm/package-defs.scm
+lib/scsh/vm/prescheme.scm
+lib/scsh/vm/prim.scm
+lib/scsh/vm/ps-interface.scm
+lib/scsh/vm/ps-memory.scm
+lib/scsh/vm/ps-package-defs.scm
+lib/scsh/vm/ps-package.scm
+lib/scsh/vm/resume.scm
+lib/scsh/vm/s48-package-defs.scm
+lib/scsh/vm/stack.scm
+lib/scsh/vm/stob.scm
+lib/scsh/vm/struct.scm
+lib/scsh/vm/vm-utilities.scm
+lib/scsh/vm/vmio.scm
+lib/scsh/scshvm
+lib/scsh/scsh.image
+lib/scsh/libscshvm.a
+lib/scsh/emacs/README
+lib/scsh/emacs/cmulisp.el
+lib/scsh/emacs/cmuscheme.el
+lib/scsh/emacs/cmuscheme48.el
+lib/scsh/emacs/cmushell.el
+lib/scsh/emacs/comint.el
+lib/scsh/emacs/jar-hacks.el
+@exec ln -fs %D/lib/scsh/doc %D/share/doc/scsh
+@unexec rm -f %D/share/doc/scsh
+@dirrm lib/scsh/emacs
+@dirrm lib/scsh/big
+@dirrm lib/scsh/cig
+@dirrm lib/scsh/doc/scsh-manual
+@dirrm lib/scsh/doc
+@dirrm lib/scsh/env
+@dirrm lib/scsh/link
+@dirrm lib/scsh/misc
+@dirrm lib/scsh/opt
+@dirrm lib/scsh/scsh
+@dirrm lib/scsh/rts
+@dirrm lib/scsh/vm
+@dirrm lib/scsh
+@unexec echo 'You might check whether to remove %D/lib/scsh.old'
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
new file mode 100644
index 00000000000..11911c88d68
--- /dev/null
+++ b/shells/tcsh/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for:	tcsh
+# Version required:     6.07.02
+# Date created:		22 August 1994
+# Whom:			jkh
+#
+# $OpenBSD: Makefile,v 1.1.1.1 1997/11/18 01:20:00 gene Exp $
+# Id: Makefile,v 1.17 1996/12/17 05:18:09 asami Exp $
+#
+
+DISTNAME=       tcsh-6.07
+PKGNAME=        tcsh-6.07.02
+CATEGORIES=	shells
+MASTER_SITES=   ftp://ftp.deshaw.com/pub/tcsh/
+
+MAINTAINER=     gene@OpenBSD.ORG
+
+GNU_CONFIGURE=  yes
+WRKSRC=         ${WRKDIR}/${PKGNAME}
+ALL_TARGET=     all catalogs
+INSTALL_TARGET= install install.man
+MAN1=		tcsh.1
+
+post-install:
+	chown bin.bin ${PREFIX}/bin/tcsh
+	chown bin.bin ${PREFIX}/man/man1/tcsh.1
+	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat
+	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.french.cat ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat
+	ln -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_BE.ISO_8859-1/tcsh.cat
+	ln -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_CA.ISO_8859-1/tcsh.cat
+	ln -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_CH.ISO_8859-1/tcsh.cat
+	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.german.cat ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat
+	ln -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_AT.ISO_8859-1/tcsh.cat
+	ln -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat
+	install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${PREFIX}/share/nls/el_GR.ISO_8859-7
+	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.greek.cat ${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat
+
+.include <bsd.port.mk>
diff --git a/shells/tcsh/files/md5 b/shells/tcsh/files/md5
new file mode 100644
index 00000000000..87e4635683b
--- /dev/null
+++ b/shells/tcsh/files/md5
@@ -0,0 +1 @@
+MD5 (tcsh-6.07.tar.gz) = 18a9d8091c6da38ebdd63ab509324eb5
diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa
new file mode 100644
index 00000000000..00182738a6a
--- /dev/null
+++ b/shells/tcsh/patches/patch-aa
@@ -0,0 +1,56 @@
+*** configure.in.orig	Sun Oct 27 08:58:56 1996
+--- configure.in	Sat Apr 19 21:37:17 1997
+***************
+*** 76,81 ****
+--- 76,91 ----
+      tcsh_config_file=sysV88
+    ;;
+  
++   ## FreeBSD
++   *-*-freebsd*)
++     tcsh_config_file=bsd4.4
++   ;;
++ 
++   ## OpenBSD
++   *-*-openbsd*)
++     tcsh_config_file=bsd4.4
++   ;;
++ 
+    ## NetBSD systems
+    *-*-netbsd*)
+      tcsh_config_file=bsd4.4
+*** configure.orig	Sun Oct 27 08:58:55 1996
+--- configure	Sat Apr 19 21:39:29 1997
+***************
+*** 582,587 ****
+--- 582,597 ----
+      tcsh_config_file=sysV88
+    ;;
+  
++   ## FreeBSD
++   *-*-freebsd*)
++     tcsh_config_file=bsd4.4
++   ;;
++ 
++   ## OpenBSD
++   *-*-openbsd*)
++     tcsh_config_file=bsd4.4
++   ;;
++ 
+    ## NetBSD systems
+    *-*-netbsd*)
+      tcsh_config_file=bsd4.4
+*** config.guess.dist	Sat Oct 19 10:54:43 1996
+--- config.guess	Sat Apr 19 22:52:46 1997
+***************
+*** 308,313 ****
+--- 308,316 ----
+      *:FreeBSD:*:*)
+  	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+  	exit 0 ;;
++     *:OpenBSD:*:*)
++ 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++ 	exit 0 ;;
+      *:NetBSD:*:*)
+  	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+  	exit 0 ;;
diff --git a/shells/tcsh/patches/patch-ab b/shells/tcsh/patches/patch-ab
new file mode 100644
index 00000000000..666000918fe
--- /dev/null
+++ b/shells/tcsh/patches/patch-ab
@@ -0,0 +1,19 @@
+*** nls/greek/set20.bak	Fri Apr 26 23:24:30 1996
+--- nls/greek/set20	Mon Dec 16 02:56:43 1996
+***************
+*** 13,19 ****
+  10 %-15s->  δεν έχει οριστεί\n
+  11 BUG!!! το %s δεν είναι συσχετισμένο με τίποτα.\n
+  12 Χρήση: bindkey [επιλογές] [--] [ΠΛΗΚΤΡΟ [ΕΝΤΟΛΗ]]\n
+! 13     -a   εμφάνιση ή συσχέτιση ΠΛΗΚΤΡΟυ στον εναλλακτικό χάρτη πλήκτρων\ν
+  14     -b   ερμηνεία ΠΛΗΚΤΡΟυ ως C-, M-, F- or X- όνομα πλήκτρου\n
+  15     -s   ερμηνεία ΕΝΤΟΛΗς ως κυριολεκτικού string γιά εμφάνιση\n
+  16     -c   ερμηνεία ΕΝΤΟΛΗς ως εσωτερικής ή εξωτερικής εντολής\n
+--- 13,19 ----
+  10 %-15s->  δεν έχει οριστεί\n
+  11 BUG!!! το %s δεν είναι συσχετισμένο με τίποτα.\n
+  12 Χρήση: bindkey [επιλογές] [--] [ΠΛΗΚΤΡΟ [ΕΝΤΟΛΗ]]\n
+! 13     -a   εμφάνιση ή συσχέτιση ΠΛΗΚΤΡΟυ στον εναλλακτικό χάρτη πλήκτρων\n
+  14     -b   ερμηνεία ΠΛΗΚΤΡΟυ ως C-, M-, F- or X- όνομα πλήκτρου\n
+  15     -s   ερμηνεία ΕΝΤΟΛΗς ως κυριολεκτικού string γιά εμφάνιση\n
+  16     -c   ερμηνεία ΕΝΤΟΛΗς ως εσωτερικής ή εξωτερικής εντολής\n
diff --git a/shells/tcsh/patches/patch-ac b/shells/tcsh/patches/patch-ac
new file mode 100644
index 00000000000..32a0e6c9522
--- /dev/null
+++ b/shells/tcsh/patches/patch-ac
@@ -0,0 +1,19 @@
+*** sh.h.bak	Sat Oct 19 21:54:12 1996
+--- sh.h	Mon Dec 16 03:02:35 1996
+***************
+*** 1085,1091 ****
+  /*
+   * To print system call errors...
+   */
+! #ifdef __NetBSD__
+  # include <errno.h>
+  #else
+  # ifndef linux
+--- 1085,1091 ----
+  /*
+   * To print system call errors...
+   */
+! #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+  # include <errno.h>
+  #else
+  # ifndef linux
diff --git a/shells/tcsh/patches/patch-ad b/shells/tcsh/patches/patch-ad
new file mode 100644
index 00000000000..490b9f6b044
--- /dev/null
+++ b/shells/tcsh/patches/patch-ad
@@ -0,0 +1,83 @@
+*** glob.c.orig	Sat Nov 13 03:40:56 1993
+--- glob.c	Mon Dec 16 03:09:07 1996
+***************
+*** 139,144 ****
+--- 139,165 ----
+  #define	M_SET		META('[')
+  #define	ismeta(c)	(((c)&M_META) != 0)
+  
++ int collate_range_cmp (c1, c2)
++ 	int c1, c2;
++ {
++ #if defined(NLS) && defined(LC_COLLATE)
++ 	static char s1[2], s2[2];
++ 	int ret;
++ #endif
++ 
++ 	c1 &= 0xFF;
++ 	c2 &= 0xFF;
++ #if defined(NLS) && defined(LC_COLLATE)
++ 	if (c1 == c2)
++ 		return (0);
++ 	s1[0] = c1;
++ 	s2[0] = c2;
++ 	if ((ret = strcoll(s1, s2)) != 0)
++ 		return (ret);
++ #endif
++ 	return (c1 - c2);
++ }
++ 
+  /*
+   * Need to dodge two kernel bugs:
+   * opendir("") != opendir(".")
+***************
+*** 646,652 ****
+  		++pat;
+  	    while (((c = *pat++) & M_MASK) != M_END) {
+  		if ((*pat & M_MASK) == M_RNG) {
+! 		    if (c <= k && k <= pat[1])
+  			ok = 1;
+  		    pat += 2;
+  		}
+--- 667,675 ----
+  		++pat;
+  	    while (((c = *pat++) & M_MASK) != M_END) {
+  		if ((*pat & M_MASK) == M_RNG) {
+! 		    if (   collate_range_cmp(CHAR(c), CHAR(k)) <= 0
+! 			&& collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0
+! 		       )
+  			ok = 1;
+  		    pat += 2;
+  		}
+*** sh.glob.c.orig	Sun May 14 00:49:17 1995
+--- sh.glob.c	Thu Oct 31 18:04:28 1996
+***************
+*** 85,90 ****
+--- 85,91 ----
+  static	void	  pword		__P((int));
+  static	void	  psave		__P((int));
+  static	void	  backeval	__P((Char *, bool));
++ extern  int       collate_range_cmp __P((int, int));
+  
+  static Char *
+  globtilde(nv, s)
+***************
+*** 1038,1045 ****
+  		if (match)
+  		    continue;
+  		if (rangec == '-' && *(pattern-2) != '[' && *pattern  != ']') {
+! 		    match = (stringc <= (*pattern & TRIM) &&
+! 			      (*(pattern-2) & TRIM) <= stringc);
+  		    pattern++;
+  		}
+  		else 
+--- 1039,1047 ----
+  		if (match)
+  		    continue;
+  		if (rangec == '-' && *(pattern-2) != '[' && *pattern  != ']') {
+! 		    match = (   collate_range_cmp(stringc, *pattern & TRIM) <= 0
+! 			     && collate_range_cmp(*(pattern-2) & TRIM, stringc) <= 0
+! 			    );
+  		    pattern++;
+  		}
+  		else 
diff --git a/shells/tcsh/patches/patch-ae b/shells/tcsh/patches/patch-ae
new file mode 100644
index 00000000000..51d93eddeb1
--- /dev/null
+++ b/shells/tcsh/patches/patch-ae
@@ -0,0 +1,67 @@
+*** tc.os.h.old	Sun May 14 00:49:26 1995
+--- tc.os.h	Sat Jun 17 06:02:53 1995
+***************
+*** 417,423 ****
+  # define NEEDgethostname
+  #endif /* _SEQUENT_ */
+  
+! #if defined(BSD) && defined(POSIXJOBS) && !defined(__hp_osf)
+  # define setpgid(pid, pgrp)	setpgrp(pid, pgrp)
+  #endif /* BSD && POSIXJOBS && !__hp_osf */
+  
+--- 417,423 ----
+  # define NEEDgethostname
+  #endif /* _SEQUENT_ */
+  
+! #if defined(BSD) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && defined(POSIXJOBS) && !defined(__hp_osf)
+  # define setpgid(pid, pgrp)	setpgrp(pid, pgrp)
+  #endif /* BSD && POSIXJOBS && !__hp_osf */
+  
+***************
+*** 468,474 ****
+  #ifndef POSIX
+  # define mygetpgrp()    getpgrp(0)
+  #else /* POSIX */
+! # if defined(BSD) || defined(SUNOS4) || defined(IRIS4D) || defined(DGUX)
+  #  define mygetpgrp()    getpgrp(0)
+  # else /* !(BSD || SUNOS4 || IRIS4D || DGUX) */
+  #  define mygetpgrp()    getpgrp()
+--- 468,474 ----
+  #ifndef POSIX
+  # define mygetpgrp()    getpgrp(0)
+  #else /* POSIX */
+! # if (defined(BSD) && !defined(__FreeBSD__)) || defined(SUNOS4) || defined(IRIS4D) || defined(DGUX)
+  #  define mygetpgrp()    getpgrp(0)
+  # else /* !(BSD || SUNOS4 || IRIS4D || DGUX) */
+  #  define mygetpgrp()    getpgrp()
+***************
+*** 657,670 ****
+  # endif /* REMOTEHOST */
+  #endif /* SUNOS4 && __GNUC__ == 2 */
+  
+! #if (defined(BSD) && !defined(__386BSD__)) || defined(SUNOS4) 
+  # if defined(__alpha) && defined(__osf__) && DECOSF1 < 200
+  extern void bcopy	__P((const void *, void *, size_t));
+  #  define memmove(a, b, c) (bcopy((char *) (b), (char *) (a), (int) (c)), a)
+  # endif /* __alpha && __osf__ && DECOSF1 < 200 */
+  #endif /* (BSD && !__386BSD__) || SUNOS4 */
+  
+! #if !defined(hpux) && !defined(COHERENT) && ((SYSVREL < 4) || defined(_SEQUENT_)) && !defined(__386BSD__) && !defined(memmove)
+  # define NEEDmemmove
+  #endif /* !hpux && !COHERENT && (SYSVREL < 4 || _SEQUENT_) && !__386BSD__ && !memmove */
+  
+--- 657,670 ----
+  # endif /* REMOTEHOST */
+  #endif /* SUNOS4 && __GNUC__ == 2 */
+  
+! #if (defined(BSD) && !defined(__386BSD__) && !defined(__FreeBSD__)) || defined(SUNOS4)
+  # if defined(__alpha) && defined(__osf__) && DECOSF1 < 200
+  extern void bcopy	__P((const void *, void *, size_t));
+  #  define memmove(a, b, c) (bcopy((char *) (b), (char *) (a), (int) (c)), a)
+  # endif /* __alpha && __osf__ && DECOSF1 < 200 */
+  #endif /* (BSD && !__386BSD__) || SUNOS4 */
+  
+! #if !defined(hpux) && !defined(COHERENT) && ((SYSVREL < 4) || defined(_SEQUENT_)) && !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(memmove)
+  # define NEEDmemmove
+  #endif /* !hpux && !COHERENT && (SYSVREL < 4 || _SEQUENT_) && !__386BSD__ && !memmove */
+  
diff --git a/shells/tcsh/patches/patch-af b/shells/tcsh/patches/patch-af
new file mode 100644
index 00000000000..249e9dc2f6d
--- /dev/null
+++ b/shells/tcsh/patches/patch-af
@@ -0,0 +1,23 @@
+*** config_f.h.bak	Fri Apr 26 23:17:30 1996
+--- config_f.h	Mon Dec 16 03:53:59 1996
+***************
+*** 65,71 ****
+   *		if you don't have <nl_types.h>, you don't want
+   *		to define this.
+   */
+! #undef NLS_CATALOGS
+  
+  /*
+   * LOGINFIRST   Source ~/.login before ~/.cshrc
+--- 65,75 ----
+   *		if you don't have <nl_types.h>, you don't want
+   *		to define this.
+   */
+! #if defined(__FreeBSD__) || defined(__OpenBSD__)
+! # define NLS_CATALOGS
+! #else
+! # undef NLS_CATALOGS
+! #endif
+  
+  /*
+   * LOGINFIRST   Source ~/.login before ~/.cshrc
diff --git a/shells/tcsh/patches/patch-ag b/shells/tcsh/patches/patch-ag
new file mode 100644
index 00000000000..b03604b22b0
--- /dev/null
+++ b/shells/tcsh/patches/patch-ag
@@ -0,0 +1,44 @@
+*** sh.func.c.bak	Sat Oct  5 21:39:10 1996
+--- sh.func.c	Mon Dec 16 04:25:04 1996
+***************
+*** 1312,1319 ****
+  # ifdef LC_COLLATE
+  	(void) setlocale(LC_COLLATE, "");
+  # endif
+! # if defined(NLS_CATALOGS) && defined(LC_MESSAGES)
+  	(void) setlocale(LC_MESSAGES, "");
+  	(void) catclose(catd);
+  	nlsinit();
+  # endif /* NLS_CATALOGS && LC_MESSAGES */
+--- 1312,1321 ----
+  # ifdef LC_COLLATE
+  	(void) setlocale(LC_COLLATE, "");
+  # endif
+! # ifdef NLS_CATALOGS
+! # ifdef LC_MESSAGES
+  	(void) setlocale(LC_MESSAGES, "");
++ # endif
+  	(void) catclose(catd);
+  	nlsinit();
+  # endif /* NLS_CATALOGS && LC_MESSAGES */
+***************
+*** 1475,1482 ****
+  # ifdef LC_COLLATE
+  		    (void) setlocale(LC_COLLATE, "");
+  # endif
+! # if defined(NLS_CATALOGS) && defined(LC_MESSAGES)
+  		    (void) setlocale(LC_MESSAGES, "");
+  		    (void) catclose(catd);
+  		    nlsinit();
+  # endif /* NLS_CATALOGS && LC_MESSAGES */
+--- 1477,1486 ----
+  # ifdef LC_COLLATE
+  		    (void) setlocale(LC_COLLATE, "");
+  # endif
+! # ifdef NLS_CATALOGS
+! # ifdef LC_MESSAGES
+  		    (void) setlocale(LC_MESSAGES, "");
++ # endif
+  		    (void) catclose(catd);
+  		    nlsinit();
+  # endif /* NLS_CATALOGS && LC_MESSAGES */
diff --git a/shells/tcsh/pkg/COMMENT b/shells/tcsh/pkg/COMMENT
new file mode 100644
index 00000000000..11c830c0b80
--- /dev/null
+++ b/shells/tcsh/pkg/COMMENT
@@ -0,0 +1 @@
+An extended C-shell with many useful features.
diff --git a/shells/tcsh/pkg/DESCR b/shells/tcsh/pkg/DESCR
new file mode 100644
index 00000000000..7c3c806b984
--- /dev/null
+++ b/shells/tcsh/pkg/DESCR
@@ -0,0 +1,2 @@
+TCSH is an extended C-shell with many useful features like
+filename completion, history editing, etc.
diff --git a/shells/tcsh/pkg/PLIST b/shells/tcsh/pkg/PLIST
new file mode 100644
index 00000000000..d060882a38a
--- /dev/null
+++ b/shells/tcsh/pkg/PLIST
@@ -0,0 +1,13 @@
+bin/tcsh
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
+@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
+man/man1/tcsh.1.gz
+share/nls/C/tcsh.cat
+share/nls/fr_FR.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/fr_BE.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/fr_CA.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/fr_CH.ISO_8859-1/tcsh.cat
+share/nls/de_DE.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/de_AT.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/de_CH.ISO_8859-1/tcsh.cat
+share/nls/el_GR.ISO_8859-7/tcsh.cat
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
new file mode 100644
index 00000000000..06ade5bc6d2
--- /dev/null
+++ b/shells/zsh/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for:	zsh
+# Version required:     	3.0.5
+# Date created:			11 Feb. 1995
+# Whom:				torstenb
+#
+# $OpenBSD: Makefile,v 1.1.1.1 1997/11/18 01:20:01 gene Exp $
+# Id: Makefile,v 1.26 1997/09/26 08:23:14 torstenb Exp $
+#
+
+DISTNAME=       zsh-3.0.5
+PKGNAME=	zsh-3.0.5
+CATEGORIES=	shells
+MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/zsh/ \
+		ftp://ftp.sterling.com/zsh/ \
+		ftp://ftp.rge.com/pub/zsh/ \
+		ftp://ftp.cenatls.cena.dgac.fr/pub/shells/zsh/ \
+		ftp://mrrl.lut.ac.uk/zsh/ \
+		ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \
+		ftp://ftp.ips.oz.au/pub/packages/zsh/ \
+		ftp://ftp.uit.no/pub/unix/shells/zsh/
+
+MAINTAINER=	gene@OpenBSD.ORG
+
+GNU_CONFIGURE=	yes
+MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
+		zshoptions.1 zshall.1 zshparam.1 zshzle.1
+
+# If you want to build a static binary, uncomment the following line
+#LDFLAGS+=-static
+
+post-install:
+	@if [ ! -f ${PREFIX}/info/dir ]; then \
+	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	 fi
+	@install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
+
+.include <bsd.port.mk>
diff --git a/shells/zsh/files/md5 b/shells/zsh/files/md5
new file mode 100644
index 00000000000..8cd98e52e4e
--- /dev/null
+++ b/shells/zsh/files/md5
@@ -0,0 +1 @@
+MD5 (zsh-3.0.5.tar.gz) = 7c3ce278a75ee8d05c5d0fc1821b2a7a
diff --git a/shells/zsh/patches/patch-aa b/shells/zsh/patches/patch-aa
new file mode 100644
index 00000000000..28109c3ca0d
--- /dev/null
+++ b/shells/zsh/patches/patch-aa
@@ -0,0 +1,19 @@
+*** Src/Makefile.in.orig	Tue Jul  9 11:00:39 1996
+--- Src/Makefile.in	Tue Jul  9 11:00:46 1996
+***************
+*** 138,144 ****
+  # install binary, creating install directory if necessary
+  install.bin: zsh
+  	$(top_srcdir)/mkinstalldirs $(bindir)
+! 	-if [ -f $(bindir)/zsh ]; then mv $(bindir)/zsh $(bindir)/zsh.old; fi
+  	$(INSTALL_PROGRAM) zsh $(bindir)/zsh
+  	-if [ -f $(bindir)/zsh-$(VERSION) ]; then rm -f $(bindir)/zsh-$(VERSION); fi
+  	ln $(bindir)/zsh $(bindir)/zsh-$(VERSION)
+--- 138,144 ----
+  # install binary, creating install directory if necessary
+  install.bin: zsh
+  	$(top_srcdir)/mkinstalldirs $(bindir)
+! 	-if [ -f $(bindir)/zsh ]; then mv -f $(bindir)/zsh $(bindir)/zsh.old; fi
+  	$(INSTALL_PROGRAM) zsh $(bindir)/zsh
+  	-if [ -f $(bindir)/zsh-$(VERSION) ]; then rm -f $(bindir)/zsh-$(VERSION); fi
+  	ln $(bindir)/zsh $(bindir)/zsh-$(VERSION)
diff --git a/shells/zsh/patches/patch-ab b/shells/zsh/patches/patch-ab
new file mode 100644
index 00000000000..c80f4c7f852
--- /dev/null
+++ b/shells/zsh/patches/patch-ab
@@ -0,0 +1,21 @@
+--- Doc/Makefile.in.orig	Wed Dec 18 05:14:11 1996
++++ Doc/Makefile.in	Mon Jun 16 20:40:29 1997
+@@ -93,7 +93,8 @@
+ everything: all zsh_us.ps zsh_a4.ps zsh_toc.html
+ 
+ zsh.info: zsh.texi
+-	@$(MAKEINFO) -I$(srcdir) $(srcdir)/zsh.texi || { \
++	@rm -f zsh.info*
++	@$(MAKEINFO) --no-split -I$(srcdir) $(srcdir)/zsh.texi || { \
+ 	echo Info documentation cannot be compiled without $(MAKEINFO). ; \
+ 	echo You can find precompiled info files in zsh-doc.tar.gz. ; }
+ 
+@@ -127,7 +128,7 @@
+ # install info pages, creating install directory if necessary
+ install.info: zsh.info
+ 	$(top_srcdir)/mkinstalldirs $(infodir)
+-	for file in zsh.info zsh.info-[1-9]; do \
++	for file in zsh.info*; do \
+ 	  [ -f "$$file" ] && $(INSTALL_DATA) $$file $(infodir) ; \
+ 	done
+ 
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac
new file mode 100644
index 00000000000..20799ee0948
--- /dev/null
+++ b/shells/zsh/patches/patch-ac
@@ -0,0 +1,13 @@
+--- Doc/zsh.texi.orig	Thu Dec 19 09:00:10 1996
++++ Doc/zsh.texi	Mon Jun 16 20:35:02 1997
+@@ -2,6 +2,10 @@
+ @c %**start of header
+ @setfilename zsh.info
+ @settitle    zsh
++@dircategory Shells
++@direntry
++* Zsh: (zsh).                   The Z shell.
++@end direntry
+ @c %**end of header
+ 
+ @setchapternewpage odd
diff --git a/shells/zsh/pkg/COMMENT b/shells/zsh/pkg/COMMENT
new file mode 100644
index 00000000000..c64b941259c
--- /dev/null
+++ b/shells/zsh/pkg/COMMENT
@@ -0,0 +1 @@
+The Z shell.
diff --git a/shells/zsh/pkg/DESCR b/shells/zsh/pkg/DESCR
new file mode 100644
index 00000000000..8f4144f053e
--- /dev/null
+++ b/shells/zsh/pkg/DESCR
@@ -0,0 +1,6 @@
+Zsh is a UNIX command interpreter (shell) which of the standard shells
+most resembles the Korn shell (ksh), although it is not completely
+compatible.  It includes enhancements of many types, notably in the
+command-line editor, options for customising its behaviour, filename
+globbing, features to make C-shell (csh) users feel more at home and
+extra features drawn from tcsh (another `custom' shell).
diff --git a/shells/zsh/pkg/PLIST b/shells/zsh/pkg/PLIST
new file mode 100644
index 00000000000..9c5f1e29fa4
--- /dev/null
+++ b/shells/zsh/pkg/PLIST
@@ -0,0 +1,18 @@
+bin/zsh
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
+@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
+bin/zsh-3.0.5
+@unexec install-info --delete %D/info/zsh.info %D/info/dir
+info/zsh.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/zsh.info %D/info/dir
+info/dir
+man/man1/zshcompctl.1.gz
+man/man1/zshexpn.1.gz
+man/man1/zshmisc.1.gz
+man/man1/zshoptions.1.gz
+man/man1/zshall.1.gz
+man/man1/zshzle.1.gz
+man/man1/zsh.1.gz
+man/man1/zshbuiltins.1.gz
+man/man1/zshparam.1.gz