integrate changes#3116,3119 from maint-5.005

p4raw-link: @3119 on //depot/maint-5.005/perl: 974d03758f8de9dcecbeb0f13de2339c50bd8536
p4raw-link: @3116 on //depot/maint-5.005/perl: 55ab10abf587fd49163e904350cf752fec2ecb09

p4raw-id: //depot/perl@3149
p4raw-branched: from //depot/maint-5.005/perl@3148 'branch in'
	apollo/netinet/in.h
p4raw-integrated: from //depot/maint-5.005/perl@3148 'merge in'
	t/lib/io_udp.t (@1649..) MANIFEST (@3086..)

5 files changed, 42 insertions, 3 deletions

diff --git a/MANIFEST b/MANIFEST
index 2620c5fe54..af10ce8df4 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -33,6 +33,7 @@ Porting/patchls		Flexible patch file listing utility
 Porting/pumpkin.pod	Guidelines and hints for Perl maintainers
 README			The Instructions
 README.amiga		Notes about AmigaOS port
+README.apollo		Notes about Apollo DomainOS port
 README.beos		Notes about BeOS port
 README.cygwin32		Notes about Cygwin32 port
 README.dos		Notes about dos/djgpp port
@@ -55,6 +56,7 @@ Todo			The Wishlist
 Todo-5.005		What needs doing before 5.005 release
 XSlock.h		Include file for extensions built with PERL_OBJECT defined
 XSUB.h			Include file for extension subroutines
+apollo/netinet/in.h	Apollo DomainOS port: C header file frontend
 av.c			Array value code
 av.h			Array value header
 beos/nm.c		BeOS port
diff --git a/README.apollo b/README.apollo
new file mode 100644
index 0000000000..04f411eb38
--- /dev/null
+++ b/README.apollo
@@ -0,0 +1,25 @@
+The following tests are known to fail as of Perl 5.005_03:
+
+comp/decl..........FAILED at test 0
+op/magic...........FAILED at test 23
+op/write...........FAILED at test 0
+lib/filefind.......FAILED at test 2
+lib/io_udp.........FAILED at test 2
+lib/findbin........stat(/ressel/ABT/USER/vta/jk/proj.local/perl/perl5.005_03-MAINT_TRIAL_5/t/lib/): No such file or directory at ../lib/FindBin.pm line 162
+stat(/ressel/ABT/USER/vta/jk/proj.local/perl/perl5.005_03-MAINT_TRIAL_5/t/lib/): No such file or directory at ../lib/FindBin.pm line 163
+FAILED at test 1
+
+Failed 6 test scripts out of 188, 93.62% okay.
+   ### Since not all tests were successful, you may want to run some
+   ### of them individually and examine any diagnostic messages they
+   ### produce.  See the INSTALL document's section on "make test".
+   ### If you are testing the compiler, then ignore this message 
+   ### and run 
+   ###      ./perl harness
+   ### in the directory ./t.
+   ###
+   ### Since most tests were successful, you have a good chance to
+   ### get information with better granularity by running
+   ###     ./perl harness 
+   ### in directory ./t.
+u=9.2  s=20.1167  cu=431.5  cs=166.133  scripts=180  tests=6348
diff --git a/apollo/netinet/in.h b/apollo/netinet/in.h
new file mode 100644
index 0000000000..cfbc0485d0
--- /dev/null
+++ b/apollo/netinet/in.h
@@ -0,0 +1,8 @@
+/* Apollo's <netinet/in.h> isn't protected against multiple inclusion. */
+
+#ifndef _NETINET_IN_INCLUDED
+#define _NETINET_IN_INCLUDED
+
+#include "/bsd4.3/usr/include/netinet/in.h"
+
+#endif /* _NETINET_IN_INCLUDED */
diff --git a/hints/apollo.sh b/hints/apollo.sh
index 8c361aa051..05f433dfc1 100644
--- a/hints/apollo.sh
+++ b/hints/apollo.sh
@@ -1,13 +1,17 @@
 # Info from Johann Klasek <jk@auto.tuwien.ac.at>
 # Merged by Andy Dougherty  <doughera@lafcol.lafayette.edu>
-# Last revised	Fri Jun  2 11:21:27 EDT 1995
+# Last revised	Tue Mar 16 19:12:22 EET 1999 by
+# Jarkko Hietaniemi <jhi@iki.fi>
 
 # uname -a looks like
 # DomainOS newton 10.4.1 bsd4.3 425t
 
 # We want to use both BSD includes and some of the features from the
 # /sys5 includes.
-ccflags="$ccflags -A cpu,mathchip -I/usr/include -I/sys5/usr/include"
+ccflags="$ccflags -A cpu,mathchip -I`pwd`/apollo -I/usr/include -I/sys5/usr/include"
+
+# When Apollo runs a script with "#!", it sets argv[0] to the script name.
+toke_cflags='ccflags="$ccflags -DARG_ZERO_IS_SCRIPT"'
 
 # These adjustments are necessary (why?) to compile malloc.c.
 freetype='void'
diff --git a/t/lib/io_udp.t b/t/lib/io_udp.t
index 1434873125..435533f6c4 100755
--- a/t/lib/io_udp.t
+++ b/t/lib/io_udp.t
@@ -13,7 +13,7 @@ BEGIN {
     if(-d "lib" && -f "TEST") {
         if ( ($Config{'extensions'} !~ /\bSocket\b/ ||
               $Config{'extensions'} !~ /\bIO\b/	||
-	      $^O eq 'os2')    &&
+	      ($^O eq 'os2') || $^O eq 'apollo')    &&
               !(($^O eq 'VMS') && $Config{d_socket})) {
 	    print "1..0\n";
 	    exit 0;