*** f:perl5.000/ext/POSIX/POSIX.xs	Sat Oct 08 03:03:32 1994
--- perl5/ext/POSIX/POSIX.xs	Thu Dec 08 22:33:40 1994
***************
*** 174,179 ****
--- 174,183 ----
  #define localeconv() not_here("localeconv")
  #endif
  
+ #ifndef HAS_MKFIFO
+ #define mkfifo(a,b) not_here("mkfifo")
+ #endif
+ 
  #ifdef HAS_TZNAME
  extern char *tzname[];
  #else
*** f:perl5.000/lib/ExtUtils/MakeMaker.pm	Mon Oct 17 17:51:44 1994
--- perl5/lib/ExtUtils/MakeMaker.pm	Tue Dec 13 12:54:40 1994
***************
*** 175,185 ****
  	if ($trace);
      foreach $dir (@$dirs){
  	foreach $name (@$names){
! 	    print "checking $dir/$name\n" if ($trace >= 2);
! 	    next unless -x "$dir/$name";
! 	    print "executing $dir/$name\n" if ($trace);
! 	    my($out) = `$dir/$name -e 'require $ver; print "5OK\n" ' 2>&1`;
! 	    return "$dir/$name" if $out =~ /5OK/;
  	}
      }
      warn "Unable to find a perl $ver (by these names: @$names, in these dirs: @$dirs)\n";
--- 175,193 ----
  	if ($trace);
      foreach $dir (@$dirs){
  	foreach $name (@$names){
! 	    if ($Config{'archname'} eq 'os2') {
! 	        print "checking $dir/$name.exe\n" if ($trace >= 2);
! 	        next unless -x "$dir/$name.exe";
! 	        print "executing $dir/$name.exe\n" if ($trace);
! 	        my($out) = `$dir/$name -e "require $ver; print \'5OK\';\" 2>&1`;
! 	        return "$dir/$name.exe" if $out =~ /5OK/;
! 	    } else {
! 	        print "checking $dir/$name\n" if ($trace >= 2);
! 	        next unless -x "$dir/$name";
! 	        print "executing $dir/$name\n" if ($trace);
! 	        my($out) = `$dir/$name -e 'require $ver; print "5OK\n" ' 2>&1`;
! 	        return "$dir/$name" if $out =~ /5OK/;
! 	    }
  	}
      }
      warn "Unable to find a perl $ver (by these names: @$names, in these dirs: @$dirs)\n";
***************
*** 243,254 ****
      # Now run ext/util/extliblist to discover what *libs definitions
      # are required for the needs of $potential_libs
      $ENV{'potential_libs'} = $potential_libs;
!     $_=`. $abstop/ext/util/extliblist;
! 	echo extralibs=\$extralibs
! 	echo dynaloadlibs=\$dynaloadlibs
! 	echo statloadlibs=\$statloadlibs
! 	echo bootdep=\$bootdep
! 	`;
      my(@w);
      foreach $line (split "\n", $_){
  	chomp $line;
--- 251,271 ----
      # Now run ext/util/extliblist to discover what *libs definitions
      # are required for the needs of $potential_libs
      $ENV{'potential_libs'} = $potential_libs;
!     if ($Config{'archname'} eq 'os2') {
!         $_=`ksh -c ". $abstop/ext/util/extliblist;
! 	   echo extralibs=\$extralibs
! 	   echo dynaloadlibs=\$dynaloadlibs
! 	   echo statloadlibs=\$statloadlibs
! 	   echo bootdep=\$bootdep
! 	   "`;
!     } else {
!         $_=`. $abstop/ext/util/extliblist;
! 	   echo extralibs=\$extralibs
! 	   echo dynaloadlibs=\$dynaloadlibs
! 	   echo statloadlibs=\$statloadlibs
! 	   echo bootdep=\$bootdep
! 	   `;
!     }
      my(@w);
      foreach $line (split "\n", $_){
  	chomp $line;
*** f:perl5.000/miniperlmain.c	Mon Oct 17 23:07:28 1994
--- perl5/miniperlmain.c	Thu Dec 08 02:44:56 1994
***************
*** 19,24 ****
--- 19,29 ----
  {
      int exitstatus;
  
+ #ifdef OS2
+     _response(&argc, &argv);
+     _wildcard(&argc, &argv);
+ #endif
+ 
  #ifdef VMS
      getredirection(&argc,&argv);
  #endif
*** f:perl5.000/perl.c	Mon Oct 17 23:13:08 1994
--- perl5/perl.c	Tue Dec 13 14:00:24 1994
***************
*** 968,977 ****
  #ifdef MSDOS
  	fputs("MS-DOS port Copyright (c) 1989, 1990, Diomidis Spinellis\n",
  	stdout);
- #ifdef OS2
-         fputs("OS/2 port Copyright (c) 1990, 1991, Raymond Chen, Kai Uwe Rommel\n",
-         stdout);
  #endif
  #endif
  #ifdef atarist
          fputs("atariST series port, ++jrb  bammi@cadence.com\n", stdout);
--- 968,978 ----
  #ifdef MSDOS
  	fputs("MS-DOS port Copyright (c) 1989, 1990, Diomidis Spinellis\n",
  	stdout);
  #endif
+ #ifdef OS2
+         fputs("OS/2 port Copyright (c) 1990, 1991, Raymond Chen, Kai Uwe Rommel\n"
+         	"Version 5 port Copyright (c) 1994, Andreas Kaiser\n",
+ 		stdout);
  #endif
  #ifdef atarist
          fputs("atariST series port, ++jrb  bammi@cadence.com\n", stdout);
*** f:perl5.000/perl.h	Mon Oct 17 23:13:16 1994
--- perl5/perl.h	Thu Dec 08 02:26:16 1994
***************
*** 469,475 ****
--- 469,479 ----
  #endif
  
  #ifdef DOSISH
+ # if defined(OS2)
+ #   include "os2ish.h"
+ # else
  #   include "dosish.h"
+ # endif
  #else
  # if defined(VMS)
  #   include "vmsish.h"
*** f:perl5.000/util.c	Mon Oct 17 23:07:38 1994
--- perl5/util.c	Thu Dec 08 02:30:08 1994
***************
*** 1283,1289 ****
      return fdopen(p[this], mode);
  }
  #else
! #ifdef atarist
  FILE *popen();
  FILE *
  my_popen(cmd,mode)
--- 1283,1289 ----
      return fdopen(p[this], mode);
  }
  #else
! #if defined(atarist) || defined(OS2)
  FILE *popen();
  FILE *
  my_popen(cmd,mode)
***************
*** 1336,1343 ****
  }
  #endif
  
! #ifndef DOSISH
! #ifndef VMS /* VMS' my_pclose() is in VMS.c */
  I32
  my_pclose(ptr)
  FILE *ptr;
--- 1336,1342 ----
  }
  #endif
  
! #if  !defined(DOSISH) && !defined(VMS)  /* VMS' my_popen() is in VMS.c */
  I32
  my_pclose(ptr)
  FILE *ptr;
***************
*** 1368,1374 ****
      signal(SIGQUIT, qstat);
      return(pid < 0 ? pid : status);
  }
! #endif /* !VMS */
  I32
  wait4pid(pid,statusp,flags)
  int pid;
--- 1367,1375 ----
      signal(SIGQUIT, qstat);
      return(pid < 0 ? pid : status);
  }
! #endif /* !DOSISH */
! 
! #if  !defined(DOSISH) || defined(OS2)
  I32
  wait4pid(pid,statusp,flags)
  int pid;
***************
*** 1442,1448 ****
      return;
  }
  
! #ifdef atarist
  int pclose();
  I32
  my_pclose(ptr)
--- 1443,1449 ----
      return;
  }
  
! #if defined(atarist) || defined(OS2)
  int pclose();
  I32
  my_pclose(ptr)
